Changeset 328


Ignore:
Timestamp:
Feb 15, 2012, 9:16:32 PM (8 years ago)
Author:
amain
Message:

Alternate boot script

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.in

    r327 r328  
    906906          to become ready, before the kernel tries to boot from it.
    907907
    908 source "config/kexec2.in"
     908source "config/kexec.in"
    909909
    910910endmenu
  • trunk/openwrt/openwrt.mk

    r327 r328  
    5252        # Copy default OpenWrt settings
    5353        cp $(CONFIG_DIR)/openwrt.defconfig $(TMP_DIR)/.config_openwrt
    54         # Merge default OpenWrt settings with menu settings
     54        # Merge default OpenWrt settings with DebWrt menu config settings
    5555        #cat .config | grep -v -e CONFIG_TARGET_BOARD -e "^#" >> $(TMP_DIR)/.config_openwrt
    5656        cat .config | grep -v -e CONFIG_TARGET_BOARD >> $(TMP_DIR)/.config_openwrt
    5757        # Merge default and menu settings with possibly altered settings in make menuconfig in OpenWrt
     58        # note: settings manually made in OpenWrt menu config will be included!
    5859        touch $(OPENWRT_BUILD_DIR)/.config
    5960        cp $(OPENWRT_BUILD_DIR)/.config $(OPENWRT_BUILD_DIR)/.config.org
    6061        $(SCRIPT_KCONFIG) + $(OPENWRT_BUILD_DIR)/.config.org $(TMP_DIR)/.config_openwrt > $(OPENWRT_BUILD_DIR)/.config
    61         # Make sure the config is clean
     62        # Filter out config options unknown to OpenWrt (e.g. pure kernel known options) / clean up OpenWrt config
    6263        $(SCRIPT_CLEAN_EXEC) $(MAKE) -C $(OPENWRT_BUILD_DIR) defconfig
    63         # Copy DebWrt config to the build dir used to set kernel compile options
     64        # Save .config to OpenWrt build-dir. During the OpenWrt build the .config kernel options are
     65        # merged with the OpenWrt's default kernel options for the target. In this phase any DebWrt/OpenWrt
     66        # specific options in the .config file are filtered out. See include/kernel-defaults.mk from OpenWrt.
    6467        cp .config $(OPENWRT_BUILD_DIR)/.config.debwrt
    6568        touch $@
  • trunk/openwrt/patches/trunk/005_make_empty_rootfs

    r322 r328  
    1 --- include/image.mk.org        2011-12-15 15:41:28.976641620 +0100
    2 +++ include/image.mk    2011-12-15 15:45:01.149693728 +0100
    3 @@ -89,7 +89,9 @@
     1--- include/image.mk.org        2012-02-15 20:30:10.713220246 +0100
     2+++ include/image.mk    2012-02-15 20:41:49.980687722 +0100
     3@@ -87,12 +87,26 @@
     4   endif
     5 
    46   ifneq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),)
     7+  ifneq ($(CONFIG_BOOT_METHOD_SCRIPT),)
    58     define Image/mkfs/squashfs
     9+               # boot direclty from device
    610                @mkdir -p $(TARGET_DIR)/overlay
    7 -               $(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)
    8 +               @mkdir -p $(TMP_DIR)/debwrt-empty-rootfs/overlay
    9 +               @touch $(TMP_DIR)/debwrt-empty-rootfs/debwrt-empty-rootfs
     11+               mkdir -p $(TMP_DIR)/debwrt-empty-rootfs/overlay
     12+               touch $(TMP_DIR)/debwrt-empty-rootfs/debwrt-empty-rootfs
    1013+               $(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)
     14+    endef
     15+  else
     16+    define Image/mkfs/squashfs
     17+               # kexec and LABEL= boot
     18+               @mkdir -p $(TARGET_DIR)/overlay
     19+               ls -l $(TARGET_DIR)
     20+               # remove /lib/modules to prevent the image from getting to big
     21+               rm -rf $(TARGET_DIR)/lib/modules
     22                $(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)
    1123                $(call Image/Build,squashfs)
    1224     endef
    1325   endif
     26+  endif
     27 
     28   ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
     29     define Image/mkfs/ubifs
Note: See TracChangeset for help on using the changeset viewer.