| 1 | --- openwrt/include/kernel-defaults.mk 2012-09-30 00:14:28.601162927 +0200 |
|---|
| 2 | +++ openwrt/include/kernel-defaults.mk.new 2012-09-30 00:14:17.834676182 +0200 |
|---|
| 3 | @@ -93,9 +93,11 @@ |
|---|
| 4 | endef |
|---|
| 5 | |
|---|
| 6 | define Kernel/Configure/Default |
|---|
| 7 | - $(LINUX_CONF_CMD) > $(LINUX_DIR)/.config.target |
|---|
| 8 | + $(LINUX_CONF_CMD) > $(LINUX_DIR)/.config.target.default |
|---|
| 9 | # copy CONFIG_KERNEL_* settings over to .config.target |
|---|
| 10 | - awk '/^(#[[:space:]]+)?CONFIG_KERNEL/{sub("CONFIG_KERNEL_","CONFIG_");print}' $(TOPDIR)/.config >> $(LINUX_DIR)/.config.target |
|---|
| 11 | + awk '/^(#[[:space:]]+)?CONFIG_KERNEL/{sub("CONFIG_KERNEL_","CONFIG_");print}' $(TOPDIR)/.config >> $(LINUX_DIR)/.config.target.default |
|---|
| 12 | +# DebWrt: merge our custom config |
|---|
| 13 | + $(SCRIPT_DIR)/kconfig.pl + $(LINUX_DIR)/.config.target.default $(TOPDIR)/.config.debwrt > $(LINUX_DIR)/.config.target |
|---|
| 14 | echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> $(LINUX_DIR)/.config.target |
|---|
| 15 | echo "# CONFIG_KALLSYMS_ALL is not set" >> $(LINUX_DIR)/.config.target |
|---|
| 16 | echo "# CONFIG_KALLSYMS_UNCOMPRESSED is not set" >> $(LINUX_DIR)/.config.target |
|---|
| 17 | @@ -103,6 +105,8 @@ |
|---|
| 18 | $(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config > $(LINUX_DIR)/.config.override |
|---|
| 19 | $(SCRIPT_DIR)/kconfig.pl 'm+' '+' $(LINUX_DIR)/.config.target /dev/null $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config |
|---|
| 20 | $(call Kernel/SetNoInitramfs) |
|---|
| 21 | +# DebWrt: merge new kernel config, say no to anything new |
|---|
| 22 | + +$(MAKE) $(KERNEL_MAKEOPTS) oldnoconfig |
|---|
| 23 | rm -rf $(KERNEL_BUILD_DIR)/modules |
|---|
| 24 | [ -d $(LINUX_DIR)/user_headers ] || $(MAKE) $(KERNEL_MAKEOPTS) INSTALL_HDR_PATH=$(LINUX_DIR)/user_headers headers_install |
|---|
| 25 | $(SH_FUNC) grep '=[ym]' $(LINUX_DIR)/.config | LC_ALL=C sort | md5s > $(LINUX_DIR)/.vermagic |
|---|
| 26 | @@ -114,7 +118,12 @@ |
|---|
| 27 | |
|---|
| 28 | define Kernel/CompileModules/Default |
|---|
| 29 | rm -f $(LINUX_DIR)/vmlinux $(LINUX_DIR)/System.map |
|---|
| 30 | - +$(MAKE) $(KERNEL_MAKEOPTS) modules |
|---|
| 31 | + # DebWrt make modules install |
|---|
| 32 | + -mkdir -p $(TMP_DIR)/modules |
|---|
| 33 | + +$(MAKE) $(KERNEL_MAKEOPTS) modules modules_install INSTALL_MOD_PATH=$(TMP_DIR)/modules |
|---|
| 34 | + echo "OPENWRT_LINUX_VERSION=$(LINUX_VERSION)" >> $(TOPDIR)/.openwrt_env |
|---|
| 35 | + echo "OPENWRT_LINUX_UNAME_VERSION=$(LINUX_UNAME_VERSION)" >> $(TOPDIR)/.openwrt_env |
|---|
| 36 | + echo "OPENWRT_LINUX_DIR=$(LINUX_DIR)" >> $(TOPDIR)/.openwrt_env |
|---|
| 37 | endef |
|---|
| 38 | |
|---|
| 39 | OBJCOPY_STRIP = -R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id |
|---|
