From 08cbdbc1b095f079e37680c972b80079524290ad Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 21 Jun 2006 02:16:37 +0000 Subject: build system cleanup. move shared include files into $(TOPDIR)/include, move lzma, mkfs.* into toolchain/ git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4032 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 125 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 include/kernel-build.mk (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk new file mode 100644 index 0000000000..9fbbe4504c --- /dev/null +++ b/include/kernel-build.mk @@ -0,0 +1,125 @@ +include $(TOPDIR)/include/modules-$(KERNEL).mk + +LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2 +LINUX_SITE=http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \ + http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \ + http://www.kernel.org/pub/linux/kernel/v$(KERNEL) \ + http://www.de.kernel.org/pub/linux/kernel/v$(KERNEL) + +KERNEL_IDIR:=$(KERNEL_BUILD_DIR)/kernel-ipkg +KERNEL_IPKG:=$(KERNEL_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_$(ARCH).ipk +INSTALL_TARGETS += $(KERNEL_IPKG) + +$(TARGETS): $(PACKAGE_DIR) + +$(LINUX_DIR): + mkdir -p $@ + +$(PACKAGE_DIR): + mkdir -p $@ + +$(DL_DIR)/$(LINUX_SOURCE): + -mkdir -p $(DL_DIR) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_SOURCE) $(LINUX_KERNEL_MD5SUM) $(LINUX_SITE) + +$(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) + -mkdir -p $(KERNEL_BUILD_DIR) + bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS) - + touch $@ + +ifeq ($(KERNEL),2.4) +$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched + $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" \ + $(LINUX_DIR)/Makefile \ + $(LINUX_DIR)/arch/*/Makefile + $(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile + $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h + touch $@ + +$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) dep + touch $@ + +$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.depend_done +else +$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts + touch $@ +endif + +ramdisk-config: $(LINUX_DIR)/.configured FORCE + mv $(LINUX_DIR)/.config $(LINUX_DIR)/.config.old + grep -v INITRAMFS $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config +ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) + echo 'CONFIG_INITRAMFS_SOURCE="../../root"' >> $(LINUX_DIR)/.config + echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config + echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config + mkdir -p $(BUILD_DIR)/root/etc/init.d + $(CP) ../generic-2.6/files/init $(BUILD_DIR)/root/ +else + rm -f $(BUILD_DIR)/root/init $(BUILD_DIR)/root/etc/init.d/S00initramfs + echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config +endif + +$(LINUX_DIR)/vmlinux: $(STAMP_DIR)/.linux-compile pkg-install ramdisk-config + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) + +$(LINUX_KERNEL): $(LINUX_DIR)/vmlinux + $(TARGET_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ + touch -c $(LINUX_KERNEL) + +$(LINUX_DIR)/.modules_done: + rm -rf $(KERNEL_BUILD_DIR)/modules + $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" modules + $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install + touch $(LINUX_DIR)/.modules_done + +$(STAMP_DIR)/.linux-compile: + @$(MAKE) $(LINUX_DIR)/.modules_done $(TARGETS) $(KERNEL_IPKG) + ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux + touch $@ + +$(KERNEL_IPKG): + rm -rf $(KERNEL_IDIR) + mkdir -p $(KERNEL_IDIR)/etc + $(SCRIPT_DIR)/make-ipkg-dir.sh $(KERNEL_IDIR) ../control/kernel.control $(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE) $(ARCH) + if [ -f ./config/$(BOARD).modules ]; then \ + cp ./config/$(BOARD).modules $(KERNEL_IDIR)/etc/modules; \ + fi + $(IPKG_BUILD) $(KERNEL_IDIR) $(KERNEL_BUILD_DIR) + +$(TOPDIR)/.kernel.mk: + echo "BOARD:=$(BOARD)" > $@ + echo "LINUX_VERSION:=$(LINUX_VERSION)" >> $@ + echo "LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@ + +pkg-install: FORCE + @{ [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG) install $(INSTALL_TARGETS) || true; } + +source: $(DL_DIR)/$(LINUX_SOURCE) +prepare: + @mkdir -p $(STAMP_DIR) $(PACKAGE_DIR) + @$(MAKE) $(LINUX_DIR)/.configured + +compile: prepare $(STAMP_DIR)/.linux-compile + +install: compile $(LINUX_KERNEL) + +mostlyclean: FORCE + rm -f $(STAMP_DIR)/.linux-compile + rm -f $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/.modules_done + rm -f $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/.drivers-unpacked + $(MAKE) -C $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) clean + rm -f $(LINUX_KERNEL) + +rebuild: FORCE + -$(MAKE) mostlyclean + if [ -f $(LINUX_KERNEL) ]; then \ + $(MAKE) clean; \ + fi + $(MAKE) compile $(MAKE_TRACE) + +clean: FORCE + rm -f $(STAMP_DIR)/.linux-compile + rm -rf $(KERNEL_BUILD_DIR) + rm -f $(TARGETS) -- cgit v1.2.3 From 24cf53528f4d83c427a457c67c65423eedb2344e Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 21 Jun 2006 02:32:39 +0000 Subject: add INCLUDE_DIR variable for $(TOPDIR)/include git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4033 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 9fbbe4504c..fc62127ca2 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -1,4 +1,4 @@ -include $(TOPDIR)/include/modules-$(KERNEL).mk +include $(INCLUDE_DIR)/modules-$(KERNEL).mk LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2 LINUX_SITE=http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \ -- cgit v1.2.3 From 4cd3d1fab11e52b41de7963228f3877c8f0162f6 Mon Sep 17 00:00:00 2001 From: Mike Baker Date: Fri, 23 Jun 2006 00:49:42 +0000 Subject: .pkginfo cleanup #2 git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4053 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index fc62127ca2..d3c47281fa 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -1,4 +1,4 @@ -include $(INCLUDE_DIR)/modules-$(KERNEL).mk +-include $(INCLUDE_DIR)/modules-$(KERNEL).mk LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2 LINUX_SITE=http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \ -- cgit v1.2.3 From e4a9076c04e017fb2e2cfc249b9a496720d19b17 Mon Sep 17 00:00:00 2001 From: Mike Baker Date: Fri, 23 Jun 2006 22:10:43 +0000 Subject: fix kernel configure target git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4065 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index d3c47281fa..dfd4227447 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -97,9 +97,8 @@ pkg-install: FORCE @{ [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG) install $(INSTALL_TARGETS) || true; } source: $(DL_DIR)/$(LINUX_SOURCE) -prepare: +prepare: $(LINUX_DIR)/.configured @mkdir -p $(STAMP_DIR) $(PACKAGE_DIR) - @$(MAKE) $(LINUX_DIR)/.configured compile: prepare $(STAMP_DIR)/.linux-compile -- cgit v1.2.3 From a5a02a409ef21581f11bda7c5a45334c71d76547 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 25 Jun 2006 16:59:19 +0000 Subject: add extra targets to improve make tracing output git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4078 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index dfd4227447..706764db58 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -8,6 +8,7 @@ LINUX_SITE=http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \ KERNEL_IDIR:=$(KERNEL_BUILD_DIR)/kernel-ipkg KERNEL_IPKG:=$(KERNEL_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_$(ARCH).ipk +TARGETS += $(KERNEL_IPKG) INSTALL_TARGETS += $(KERNEL_IPKG) $(TARGETS): $(PACKAGE_DIR) @@ -74,8 +75,12 @@ $(LINUX_DIR)/.modules_done: $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install touch $(LINUX_DIR)/.modules_done +modules: $(LINUX_DIR)/.modules_done +packages: $(TARGETS) + $(STAMP_DIR)/.linux-compile: - @$(MAKE) $(LINUX_DIR)/.modules_done $(TARGETS) $(KERNEL_IPKG) + @$(MAKE) modules + @$(MAKE) packages ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux touch $@ -- cgit v1.2.3 From fef592fc162352c3e6180b9fbe55abbcff12fd98 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 26 Jun 2006 01:55:47 +0000 Subject: add support for new modules.mk format (no autogenerated Config.in yet) git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4083 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 90 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 706764db58..3a455a812e 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -127,3 +127,93 @@ clean: FORCE rm -f $(STAMP_DIR)/.linux-compile rm -rf $(KERNEL_BUILD_DIR) rm -f $(TARGETS) + + +define AutoLoad +add_module $(1) "$(2)"; +endef + +define KernelPackage/Defaults + VERSION:=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE) + DEPENDS:= + MAINTAINER:=OpenWrt Developers Team + SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd}) + PKGARCH:=$(ARCH) + PRIORITY:=optional + KCONFIG:= + FILES:= + BUILD:= + MODULES:= + TITLE:= + DESCRIPTION:= +endef + +define KernelPackage + NAME:=$(1) + $(eval $(call KernelPackage/Defaults)) + $(eval $(call KernelPackage/$(1))) + $(eval $(call KernelPackage/$(1)/$(KERNEL))) + + PKG_$(1) := $(PACKAGE_DIR)/kmod-$(1)_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_$(ARCH).ipk + I_$(1) := $(KMOD_BUILD_DIR)/ipkg/$(1) + + IDEPEND_$(1):='kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))' $(DEPENDS) + + ifeq ($$(strip $(KCONFIG)),) + KDEPEND_$(1):=m + else + KDEPEND_$(1):=$($(KCONFIG)) + endif + ifeq ($$(KDEPEND_$(1)),m) + ifneq ($(CONFIG_PACKAGE_kmod-$(1)),) + packages: $$(PKG_$(1)) + endif + ifeq ($(CONFIG_PACKAGE_kmod-$(1)),y) + install-kmod-$(1): FORCE + $(IPKG) install $$(PKG_$(1)) + pkg-install: install-kmod-$(1) + endif + endif + + $$(PKG_$(1)): $(LINUX_DIR)/.modules_done + rm -rf $$(I_$(1)) + install -d -m0755 $$(I_$(1))/CONTROL + echo "Package: kmod-$(1)" > $$(I_$(1))/CONTROL/control + echo "Version: $(VERSION)" >> $$(I_$(1))/CONTROL/control + ( \ + DEPENDS=; \ + for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \ + DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \ + done; \ + echo "Depends: $$$$DEPENDS" >> $$(I_$(1))/CONTROL/control; \ + ) + echo "Source: $(SOURCE)" >> $$(I_$(1))/CONTROL/control + echo "Section: kernel" >> $$(I_$(1))/CONTROL/control + echo "Priority: $(PRIORITY)" >> $$(I_$(1))/CONTROL/control + echo "Maintainer: $(MAINTAINER)" >> $$(I_$(1))/CONTROL/control + echo "Architecture: $(PKGARCH)" >> $$(I_$(1))/CONTROL/control + echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(I_$(1))/CONTROL/control + ifneq ($(strip $(FILES)),) + mkdir -p $$(I_$(1))/lib/modules/$(LINUX_VERSION) + $(CP) $(FILES) $$(I_$(1))/lib/modules/$(LINUX_VERSION)/ + endif + ifneq ($(MODULES),) + export modules=; \ + add_module() { \ + mkdir -p $$(I_$(1))/etc/modules.d; \ + echo "$$$$2" > $$(I_$(1))/etc/modules.d/$$$$1-$(1); \ + modules="$$$${modules:+$$$$modules }$$$$1-$(1)"; \ + }; \ + $(MODULES) \ + mkdir -p $$(I_$(1))/etc/modules.d; \ + echo "#!/bin/sh" >> $$(I_$(1))/CONTROL/postinst; \ + echo "[ -z \"\$$$$IPKG_INSTROOT\" ] || exit" >> $$(I_$(1))/CONTROL/postinst; \ + echo ". /etc/functions.sh" >> $$(I_$(1))/CONTROL/postinst; \ + echo "load_modules $$$$modules" >> $$(I_$(1))/CONTROL/postinst; \ + chmod 0755 $$(I_$(1))/CONTROL/postinst; + endif + $(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR) +endef + +-include $(INCLUDE_DIR)/modules.mk + -- cgit v1.2.3 From f9e5c1b1d5c9d4968f8a3ca32a29e65997b704b9 Mon Sep 17 00:00:00 2001 From: Mike Baker Date: Tue, 27 Jun 2006 00:35:46 +0000 Subject: credit where credit is due git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4091 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 3a455a812e..6fae4acc53 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# -include $(INCLUDE_DIR)/modules-$(KERNEL).mk LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2 -- cgit v1.2.3 From 3a1b3ff177f46843403c8943e7a5b44cb5f730b5 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 28 Jun 2006 17:30:39 +0000 Subject: add workaround for kernel module install git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4098 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 6fae4acc53..55a74701c7 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -105,7 +105,9 @@ $(TOPDIR)/.kernel.mk: echo "LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@ pkg-install: FORCE - @{ [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG) install $(INSTALL_TARGETS) || true; } + @for pkg in $(INSTALL_TARGETS); do \ + $(IPKG) install $$pkg || echo; \ + done source: $(DL_DIR)/$(LINUX_SOURCE) prepare: $(LINUX_DIR)/.configured -- cgit v1.2.3 From f525b8b0280b63fb7c021a027b3343e003a85e18 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 18 Jul 2006 16:17:19 +0000 Subject: move some of the kernel module packaging to package/kernel/ git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4146 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 89 ------------------------------------------------- 1 file changed, 89 deletions(-) (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 55a74701c7..942a91516b 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -136,92 +136,3 @@ clean: FORCE rm -rf $(KERNEL_BUILD_DIR) rm -f $(TARGETS) - -define AutoLoad -add_module $(1) "$(2)"; -endef - -define KernelPackage/Defaults - VERSION:=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE) - DEPENDS:= - MAINTAINER:=OpenWrt Developers Team - SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd}) - PKGARCH:=$(ARCH) - PRIORITY:=optional - KCONFIG:= - FILES:= - BUILD:= - MODULES:= - TITLE:= - DESCRIPTION:= -endef - -define KernelPackage - NAME:=$(1) - $(eval $(call KernelPackage/Defaults)) - $(eval $(call KernelPackage/$(1))) - $(eval $(call KernelPackage/$(1)/$(KERNEL))) - - PKG_$(1) := $(PACKAGE_DIR)/kmod-$(1)_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_$(ARCH).ipk - I_$(1) := $(KMOD_BUILD_DIR)/ipkg/$(1) - - IDEPEND_$(1):='kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))' $(DEPENDS) - - ifeq ($$(strip $(KCONFIG)),) - KDEPEND_$(1):=m - else - KDEPEND_$(1):=$($(KCONFIG)) - endif - ifeq ($$(KDEPEND_$(1)),m) - ifneq ($(CONFIG_PACKAGE_kmod-$(1)),) - packages: $$(PKG_$(1)) - endif - ifeq ($(CONFIG_PACKAGE_kmod-$(1)),y) - install-kmod-$(1): FORCE - $(IPKG) install $$(PKG_$(1)) - pkg-install: install-kmod-$(1) - endif - endif - - $$(PKG_$(1)): $(LINUX_DIR)/.modules_done - rm -rf $$(I_$(1)) - install -d -m0755 $$(I_$(1))/CONTROL - echo "Package: kmod-$(1)" > $$(I_$(1))/CONTROL/control - echo "Version: $(VERSION)" >> $$(I_$(1))/CONTROL/control - ( \ - DEPENDS=; \ - for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \ - DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \ - done; \ - echo "Depends: $$$$DEPENDS" >> $$(I_$(1))/CONTROL/control; \ - ) - echo "Source: $(SOURCE)" >> $$(I_$(1))/CONTROL/control - echo "Section: kernel" >> $$(I_$(1))/CONTROL/control - echo "Priority: $(PRIORITY)" >> $$(I_$(1))/CONTROL/control - echo "Maintainer: $(MAINTAINER)" >> $$(I_$(1))/CONTROL/control - echo "Architecture: $(PKGARCH)" >> $$(I_$(1))/CONTROL/control - echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(I_$(1))/CONTROL/control - ifneq ($(strip $(FILES)),) - mkdir -p $$(I_$(1))/lib/modules/$(LINUX_VERSION) - $(CP) $(FILES) $$(I_$(1))/lib/modules/$(LINUX_VERSION)/ - endif - ifneq ($(MODULES),) - export modules=; \ - add_module() { \ - mkdir -p $$(I_$(1))/etc/modules.d; \ - echo "$$$$2" > $$(I_$(1))/etc/modules.d/$$$$1-$(1); \ - modules="$$$${modules:+$$$$modules }$$$$1-$(1)"; \ - }; \ - $(MODULES) \ - mkdir -p $$(I_$(1))/etc/modules.d; \ - echo "#!/bin/sh" >> $$(I_$(1))/CONTROL/postinst; \ - echo "[ -z \"\$$$$IPKG_INSTROOT\" ] || exit" >> $$(I_$(1))/CONTROL/postinst; \ - echo ". /etc/functions.sh" >> $$(I_$(1))/CONTROL/postinst; \ - echo "load_modules $$$$modules" >> $$(I_$(1))/CONTROL/postinst; \ - chmod 0755 $$(I_$(1))/CONTROL/postinst; - endif - $(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR) -endef - --include $(INCLUDE_DIR)/modules.mk - -- cgit v1.2.3 From 42fb2160c46f0bd58ab25972956ee0fffa5d8461 Mon Sep 17 00:00:00 2001 From: Gerry Rozema Date: Thu, 20 Jul 2006 21:06:47 +0000 Subject: UML target completed. Added ext2 target fs for use with uml images git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4178 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 942a91516b..f46e7f0ff3 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -72,13 +72,13 @@ $(LINUX_DIR)/vmlinux: $(STAMP_DIR)/.linux-compile pkg-install ramdisk-config $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux - $(TARGET_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ + $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ touch -c $(LINUX_KERNEL) $(LINUX_DIR)/.modules_done: rm -rf $(KERNEL_BUILD_DIR)/modules $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" modules - $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install + $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install touch $(LINUX_DIR)/.modules_done modules: $(LINUX_DIR)/.modules_done -- cgit v1.2.3 From 831ed635d4f925eb254eaf0d7e949c17226d091f Mon Sep 17 00:00:00 2001 From: Mike Baker Date: Thu, 20 Jul 2006 23:52:27 +0000 Subject: change $(STAMP_DIR) to $(LINUX_DIR) to avoid issues compiling multiple kernels git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4180 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index f46e7f0ff3..3fb96e1007 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -19,9 +19,6 @@ INSTALL_TARGETS += $(KERNEL_IPKG) $(TARGETS): $(PACKAGE_DIR) -$(LINUX_DIR): - mkdir -p $@ - $(PACKAGE_DIR): mkdir -p $@ @@ -68,7 +65,7 @@ else echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config endif -$(LINUX_DIR)/vmlinux: $(STAMP_DIR)/.linux-compile pkg-install ramdisk-config +$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux @@ -84,10 +81,10 @@ $(LINUX_DIR)/.modules_done: modules: $(LINUX_DIR)/.modules_done packages: $(TARGETS) -$(STAMP_DIR)/.linux-compile: +$(LINUX_DIR)/.linux-compile: + ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux @$(MAKE) modules @$(MAKE) packages - ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux touch $@ $(KERNEL_IPKG): @@ -111,14 +108,14 @@ pkg-install: FORCE source: $(DL_DIR)/$(LINUX_SOURCE) prepare: $(LINUX_DIR)/.configured - @mkdir -p $(STAMP_DIR) $(PACKAGE_DIR) + @mkdir -p $(LINUX_DIR) $(PACKAGE_DIR) -compile: prepare $(STAMP_DIR)/.linux-compile +compile: prepare $(LINUX_DIR)/.linux-compile install: compile $(LINUX_KERNEL) mostlyclean: FORCE - rm -f $(STAMP_DIR)/.linux-compile + rm -f $(LINUX_DIR)/.linux-compile rm -f $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/.modules_done rm -f $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/.drivers-unpacked $(MAKE) -C $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) clean -- cgit v1.2.3 From 17dad6fbd266df1c60e536828d28adaf414386f3 Mon Sep 17 00:00:00 2001 From: Mike Baker Date: Fri, 21 Jul 2006 17:00:14 +0000 Subject: fix a few directories missed in [4176]'s source -> download git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4198 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 3fb96e1007..38ea9a18eb 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -106,7 +106,7 @@ pkg-install: FORCE $(IPKG) install $$pkg || echo; \ done -source: $(DL_DIR)/$(LINUX_SOURCE) +download: $(DL_DIR)/$(LINUX_SOURCE) prepare: $(LINUX_DIR)/.configured @mkdir -p $(LINUX_DIR) $(PACKAGE_DIR) -- cgit v1.2.3 From ad8fe944b96ca72bfd408abfd297ea4bf0e0ef9b Mon Sep 17 00:00:00 2001 From: Mike Baker Date: Fri, 4 Aug 2006 05:30:27 +0000 Subject: more cleanup (make sure to pass TARGET_PATH and not just TARGET_CC) git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4432 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 38ea9a18eb..e3f2d5daed 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -66,7 +66,7 @@ else endif $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config - $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ @@ -75,7 +75,7 @@ $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux $(LINUX_DIR)/.modules_done: rm -rf $(KERNEL_BUILD_DIR)/modules $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" modules - $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install + $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install touch $(LINUX_DIR)/.modules_done modules: $(LINUX_DIR)/.modules_done -- cgit v1.2.3 From 1dac4c1d1686b1d8360d5205a271e96c45c8694a Mon Sep 17 00:00:00 2001 From: Mike Baker Date: Fri, 4 Aug 2006 06:23:47 +0000 Subject: yet more cleanup (make sure to honor TARGET_CC and not just TARGET_CROSS) git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4433 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index e3f2d5daed..0f29a306bf 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -33,11 +33,8 @@ $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) ifeq ($(KERNEL),2.4) $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched - $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" \ - $(LINUX_DIR)/Makefile \ - $(LINUX_DIR)/arch/*/Makefile $(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile - $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h + PATH="$(TARGET_PATH)" $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h touch $@ $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured @@ -47,7 +44,7 @@ $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.depend_done else $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched - $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts + PATH="$(TARGET_PATH)" $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts touch $@ endif @@ -66,16 +63,16 @@ else endif $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config - $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" + PATH="$(TARGET_PATH)" $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux - $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ + PATH="$(TARGET_PATH)" $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ touch -c $(LINUX_KERNEL) $(LINUX_DIR)/.modules_done: rm -rf $(KERNEL_BUILD_DIR)/modules - $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" modules - $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install + PATH="$(TARGET_PATH)" $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) modules + PATH="$(TARGET_PATH)" $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install touch $(LINUX_DIR)/.modules_done modules: $(LINUX_DIR)/.modules_done -- cgit v1.2.3 From 2ffe012ebb6fe6bf1bd8db2305e50d2dc30453a3 Mon Sep 17 00:00:00 2001 From: Mike Baker Date: Fri, 4 Aug 2006 11:59:52 +0000 Subject: set PATH in rules.mk git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4438 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 0f29a306bf..9af1142d33 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -34,7 +34,7 @@ $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) ifeq ($(KERNEL),2.4) $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched $(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile - PATH="$(TARGET_PATH)" $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h touch $@ $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured @@ -44,7 +44,7 @@ $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.depend_done else $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched - PATH="$(TARGET_PATH)" $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts touch $@ endif @@ -63,16 +63,16 @@ else endif $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config - PATH="$(TARGET_PATH)" $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux - PATH="$(TARGET_PATH)" $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ + $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ touch -c $(LINUX_KERNEL) $(LINUX_DIR)/.modules_done: rm -rf $(KERNEL_BUILD_DIR)/modules - PATH="$(TARGET_PATH)" $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) modules - PATH="$(TARGET_PATH)" $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install + $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) modules + $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install touch $(LINUX_DIR)/.modules_done modules: $(LINUX_DIR)/.modules_done -- cgit v1.2.3 From f761ee36c8938a7302486431cae21514a36ab263 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sat, 5 Aug 2006 00:55:41 +0000 Subject: Force remove of the symbolic link build_arm/linux, especially when switching from targets using the same toolchain (ex : switching from brcm-2.4 to au1000-2.6) git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4462 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 9af1142d33..bf6f2c2eca 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -79,6 +79,7 @@ modules: $(LINUX_DIR)/.modules_done packages: $(TARGETS) $(LINUX_DIR)/.linux-compile: + @rm -f $(BUILD_DIR)/linux ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux @$(MAKE) modules @$(MAKE) packages -- cgit v1.2.3 From e0eceb4c866bcc000b9af4c3e8fab30bae4eccb5 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Thu, 10 Aug 2006 11:16:46 +0000 Subject: fix uml-2.6 (closes: #678) git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4551 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index bf6f2c2eca..a8c9e7fd25 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -34,7 +34,7 @@ $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) ifeq ($(KERNEL),2.4) $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched $(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile - $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h touch $@ $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured @@ -44,7 +44,7 @@ $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.depend_done else $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched - $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts touch $@ endif @@ -63,7 +63,7 @@ else endif $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config - $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ @@ -71,8 +71,8 @@ $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux $(LINUX_DIR)/.modules_done: rm -rf $(KERNEL_BUILD_DIR)/modules - $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) modules - $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install + $(MAKE) -C "$(LINUX_DIR)" CC="$(KERNEL_CC)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) modules + $(MAKE) -C "$(LINUX_DIR)" CC="$(KERNEL_CC)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install touch $(LINUX_DIR)/.modules_done modules: $(LINUX_DIR)/.modules_done -- cgit v1.2.3 From c3ccd3a1d04c21a32c3cfa07f54da2ad6a5b933a Mon Sep 17 00:00:00 2001 From: Mike Baker Date: Wed, 16 Aug 2006 00:35:30 +0000 Subject: fix issues if kernel config is changed after the compile has started git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4570 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index a8c9e7fd25..665f0ff744 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -94,10 +94,11 @@ $(KERNEL_IPKG): fi $(IPKG_BUILD) $(KERNEL_IDIR) $(KERNEL_BUILD_DIR) -$(TOPDIR)/.kernel.mk: - echo "BOARD:=$(BOARD)" > $@ - echo "LINUX_VERSION:=$(LINUX_VERSION)" >> $@ - echo "LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@ +$(TOPDIR)/.kernel.mk: $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/Makefile + echo "CONFIG_BOARD:=$(BOARD)" > $@ + echo "CONFIG_KERNEL:=$(KERNEL)" >> $@ + echo "CONFIG_LINUX_VERSION:=$(LINUX_VERSION)" >> $@ + echo "CONFIG_LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@ pkg-install: FORCE @for pkg in $(INSTALL_TARGETS); do \ -- cgit v1.2.3 From fe3afc62e8f898b265ec2243982837ef8ecffb57 Mon Sep 17 00:00:00 2001 From: Gerry Rozema Date: Thu, 17 Aug 2006 07:20:08 +0000 Subject: Build bzImage for x86 builds - allow ext2 images even if initramfs used, they are needed for creating boot images git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4579 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 665f0ff744..8400bd2f1e 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -63,7 +63,7 @@ else endif $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config - $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) $(KERNELNAME) $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ -- cgit v1.2.3 From daa69f4ebf2bd8f78ea8346d5c1bff13e72245c0 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Fri, 18 Aug 2006 01:18:24 +0000 Subject: cosmetic coherency fix git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4588 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 8400bd2f1e..5e4534281a 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -71,8 +71,8 @@ $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux $(LINUX_DIR)/.modules_done: rm -rf $(KERNEL_BUILD_DIR)/modules - $(MAKE) -C "$(LINUX_DIR)" CC="$(KERNEL_CC)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) modules - $(MAKE) -C "$(LINUX_DIR)" CC="$(KERNEL_CC)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install + $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) modules + $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install touch $(LINUX_DIR)/.modules_done modules: $(LINUX_DIR)/.modules_done -- cgit v1.2.3 From e573f27c2980c35b57befe1cc41d1d4988219c10 Mon Sep 17 00:00:00 2001 From: Gerry Rozema Date: Fri, 18 Aug 2006 12:39:49 +0000 Subject: Update for initramfs handling git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4591 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 5e4534281a..0ef00de35d 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -57,6 +57,7 @@ ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config mkdir -p $(BUILD_DIR)/root/etc/init.d $(CP) ../generic-2.6/files/init $(BUILD_DIR)/root/ + $(CP) ../generic-2.6/files/postinit $(BUILD_DIR)/root/ else rm -f $(BUILD_DIR)/root/init $(BUILD_DIR)/root/etc/init.d/S00initramfs echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config -- cgit v1.2.3 From 986d8ba19bba942e2c58f64f0eaaef443ce69c59 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 18 Aug 2006 14:44:30 +0000 Subject: remove reference to missing file git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4595 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 0ef00de35d..5e4534281a 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -57,7 +57,6 @@ ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config mkdir -p $(BUILD_DIR)/root/etc/init.d $(CP) ../generic-2.6/files/init $(BUILD_DIR)/root/ - $(CP) ../generic-2.6/files/postinit $(BUILD_DIR)/root/ else rm -f $(BUILD_DIR)/root/init $(BUILD_DIR)/root/etc/init.d/S00initramfs echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config -- cgit v1.2.3 From be9cf7f78a857b99bd6473dbf7b7f02d44a64be5 Mon Sep 17 00:00:00 2001 From: Gerry Rozema Date: Fri, 18 Aug 2006 19:39:51 +0000 Subject: handle postinit for initramfs git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4601 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 5e4534281a..0ef00de35d 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -57,6 +57,7 @@ ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config mkdir -p $(BUILD_DIR)/root/etc/init.d $(CP) ../generic-2.6/files/init $(BUILD_DIR)/root/ + $(CP) ../generic-2.6/files/postinit $(BUILD_DIR)/root/ else rm -f $(BUILD_DIR)/root/init $(BUILD_DIR)/root/etc/init.d/S00initramfs echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config -- cgit v1.2.3 From db948ca4c257105fff648d0d0434d0f0452b39c1 Mon Sep 17 00:00:00 2001 From: Gerry Rozema Date: Fri, 18 Aug 2006 22:38:20 +0000 Subject: Remove postinit stuff for initramfs git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4605 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 0ef00de35d..5e4534281a 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -57,7 +57,6 @@ ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config mkdir -p $(BUILD_DIR)/root/etc/init.d $(CP) ../generic-2.6/files/init $(BUILD_DIR)/root/ - $(CP) ../generic-2.6/files/postinit $(BUILD_DIR)/root/ else rm -f $(BUILD_DIR)/root/init $(BUILD_DIR)/root/etc/init.d/S00initramfs echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config -- cgit v1.2.3 From 8e1fd3261c789a840dfe6f95a6367913d457d3d2 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 27 Aug 2006 13:22:42 +0000 Subject: move $(MAKE) packages from .linux-compile: to compile: git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4689 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 5e4534281a..c5b3668481 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -82,7 +82,6 @@ $(LINUX_DIR)/.linux-compile: @rm -f $(BUILD_DIR)/linux ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux @$(MAKE) modules - @$(MAKE) packages touch $@ $(KERNEL_IPKG): @@ -110,6 +109,7 @@ prepare: $(LINUX_DIR)/.configured @mkdir -p $(LINUX_DIR) $(PACKAGE_DIR) compile: prepare $(LINUX_DIR)/.linux-compile + @$(MAKE) packages install: compile $(LINUX_KERNEL) -- cgit v1.2.3 From 443d4b872619902bb2457c5e2dbdb9e9786a9b14 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 10 Oct 2006 13:41:00 +0000 Subject: put LINUX_KARCH in .kernel.mk git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@5013 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index c5b3668481..6aefe0b891 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -17,6 +17,15 @@ KERNEL_IPKG:=$(KERNEL_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEAS TARGETS += $(KERNEL_IPKG) INSTALL_TARGETS += $(KERNEL_IPKG) +LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \ + -e 's/mipsel/mips/' \ + -e 's/mipseb/mips/' \ + -e 's/powerpc/ppc/' \ + -e 's/sh[234]/sh/' \ + -e 's/armeb/arm/' \ +) + + $(TARGETS): $(PACKAGE_DIR) $(PACKAGE_DIR): @@ -98,6 +107,7 @@ $(TOPDIR)/.kernel.mk: $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/Makefile echo "CONFIG_KERNEL:=$(KERNEL)" >> $@ echo "CONFIG_LINUX_VERSION:=$(LINUX_VERSION)" >> $@ echo "CONFIG_LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@ + echo "CONFIG_LINUX_KARCH:=$(LINUX_KARCH)" >> $@ pkg-install: FORCE @for pkg in $(INSTALL_TARGETS); do \ -- cgit v1.2.3 From c55de004921e2f3208bf93d9f0ec4d0acb10a3c7 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 10 Oct 2006 23:04:46 +0000 Subject: more fixes git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@5048 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'include/kernel-build.mk') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 6aefe0b891..5544a82e37 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -4,6 +4,7 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # +include $(INCLUDE_DIR)/host.mk -include $(INCLUDE_DIR)/modules-$(KERNEL).mk LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2 -- cgit v1.2.3