Modify

Opened 5 years ago

Closed 4 years ago

#10036 closed defect (fixed)

building a kernels fails with openwrt/trunk

Reported by: anonymous Owned by:
Priority: major Milestone: milestone:trunk
Component: openwrt Version: trunk
Severity: severity 4 Keywords:
Cc: adi@…

Description

some of the patches need forward porting to current version of openwrt;here is a patch that works for me:

Index: openwrt/patches/all/012_disable_all_openwrt_packages
===================================================================
--- openwrt/patches/all/012_disable_all_openwrt_packages        (revision 639)
+++ openwrt/patches/all/012_disable_all_openwrt_packages        (working copy)
@@ -1,14 +1,14 @@
---- openwrt/include/toplevel.mk.org    2010-01-02 00:28:44.000000000 +0100
-+++ openwrt/include/toplevel.mk        2010-01-02 00:14:07.000000000 +0100
-@@ -49,6 +49,11 @@
-               f=tmp/.$${type}info; t=tmp/.config-$${type}.in; \
-               [ "$$t" -nt "$$f" ] || ./scripts/metadata.pl $${type}_config "$$f" > "$$t" || { rm -f "$$t"; echo "Failed to build $$t"; false; break; }; \
+--- openwrt/include/toplevel.mk        2014-11-25 09:40:21.150076567 +0100
++++ openwrt/include/toplevel.mk        2014-11-25 09:58:58.932545832 +0100
+@@ -75,6 +75,11 @@
        done
-+      # DebWrt: we don't need to build any packages by default, so we disable them
+       [ tmp/.config-feeds.in -nt tmp/.packagefeeds ] || ./scripts/feeds feed_config > tmp/.config-feeds.in
+       ./scripts/metadata.pl package_mk tmp/.packageinfo > tmp/.packagedeps || { rm -f tmp/.packagedeps; false; }
++      # DebWrt: we don't need to build any packages by default, so we disable them
 +      #         all. This allows us to have fine control over which packages we
 +      #         want to build.
 +      sed 's/default [ynm]/default n/g' tmp/.config-package.in > tmp/.config-package.in.new
 +      mv tmp/.config-package.in.new tmp/.config-package.in
-       ./scripts/metadata.pl package_mk tmp/.packageinfo > tmp/.packagedeps || { rm -f tmp/.packagedeps; false; }
+       ./scripts/metadata.pl package_feeds tmp/.packageinfo > tmp/.packagefeeds || { rm -f tmp/.packagefeeds; false; }
        touch $(TOPDIR)/tmp/.build

Index: openwrt/patches/trunk/025_make_empty_rootfs
===================================================================
--- openwrt/patches/trunk/025_make_empty_rootfs (revision 639)
+++ openwrt/patches/trunk/025_make_empty_rootfs (working copy)
@@ -1,29 +1,14 @@
---- openwrt/include/image.mk.org
-+++ openwrt/include/image.mk
-@@ -122,12 +122,26 @@
- endif
+--- openwrt/include/image.mk   2014-11-25 09:40:21.000000000 +0100
++++ openwrt/include/image.mk   2014-11-25 10:09:03.338449921 +0100
+@@ -132,6 +132,11 @@
+ $(eval $(foreach S,$(NAND_BLOCKSIZE),$(call Image/mkfs/jffs2-nand/template,$(S))))

- ifneq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),)
-+ifneq ($(CONFIG_BOOT_METHOD_SCRIPT),)
-     define Image/mkfs/squashfs
-+              # boot direclty from device
-               @mkdir -p $(TARGET_DIR)/overlay
-+              mkdir -p $(TMP_DIR)/debwrt-empty-rootfs/overlay
-+              touch $(TMP_DIR)/debwrt-empty-rootfs/debwrt-empty-rootfs
-+              $(STAGING_DIR_HOST)/bin/mksquashfs4 $(TMP_DIR)/debwrt-empty-rootfs/ $(KDIR)/root.squashfs -nopad -noappend -root-owned -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) -processors $(if $(CONFIG_PKG_BUILD_JOBS),$(CONFIG_PKG_BUILD_JOBS),1)
-+    endef
-+  else
-+    define Image/mkfs/squashfs
-+              # kexec and LABEL= boot
-+              @mkdir -p $(TARGET_DIR)/overlay
-+              ls -l $(TARGET_DIR)
-+              # remove /lib/modules to prevent the image from getting to big
-+              rm -rf $(TARGET_DIR)/lib/modules
-               $(STAGING_DIR_HOST)/bin/mksquashfs4 $(TARGET_DIR) $(KDIR)/root.squashfs -nopad -noappend -root-owned -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) -processors $(if $(CONFIG_PKG_BUILD_JOBS),$(CONFIG_PKG_BUILD_JOBS),1)
-               $(call Image/Build,squashfs)
-     endef
- endif
-+endif
+ define Image/mkfs/squashfs
++      # kexec and LABEL= boot
++      @mkdir -p $(TARGET_DIR)/overlay
++      ls -l $(TARGET_DIR)
++      # remove /lib/modules to prevent the image from getting to big
++      rm -rf $(TARGET_DIR)/lib/modules
+       $(STAGING_DIR_HOST)/bin/mksquashfs4 $(TARGET_DIR) $(KDIR)/root.squashfs -nopad -noappend -root-owned -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) -processors $(if $(CONFIG_PKG_BUILD_JOBS),$(CONFIG_PKG_BUILD_JOBS),1)
+ endef

- ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
-     define Image/mkfs/ubifs

Attachments (0)

Change History (1)

comment:1 Changed 4 years ago by amain

  • Resolution set to fixed
  • Status changed from new to closed

Thanks for helping by posting this patch. It has been included (slightly changed) in r673.

Add Comment

Modify Ticket

Action
as closed The ticket will remain with no owner.
The resolution will be deleted. Next status will be 'reopened'.
Author


E-mail address and user name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.