summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/image.mk77
-rw-r--r--include/kernel-build.mk (renamed from target/linux/kernel.mk)33
-rw-r--r--include/kernel.mk (renamed from target/linux/rules.mk)34
-rw-r--r--include/modules-2.4.mk (renamed from target/linux/generic-2.4/modules.mk)2
-rw-r--r--include/modules-2.6.mk (renamed from target/linux/generic-2.6/modules.mk)2
-rw-r--r--include/netfilter.mk (renamed from target/linux/netfilter.mk)0
-rw-r--r--include/package.mk (renamed from package/rules.mk)0
-rw-r--r--package/alsa/Makefile4
-rw-r--r--package/base-files/Makefile4
-rw-r--r--package/bridge/Makefile2
-rw-r--r--package/broadcom-wl/Makefile4
-rw-r--r--package/busybox/Makefile2
-rw-r--r--package/diag/Makefile4
-rw-r--r--package/dnsmasq/Makefile2
-rw-r--r--package/dropbear/Makefile2
-rw-r--r--package/ebtables/Makefile2
-rw-r--r--package/fuse/Makefile4
-rw-r--r--package/haserl/Makefile2
-rw-r--r--package/hostap/Makefile4
-rw-r--r--package/hostapd/Makefile2
-rw-r--r--package/iproute2/Makefile2
-rw-r--r--package/ipsec-tools/Makefile2
-rw-r--r--package/ipset/Makefile2
-rw-r--r--package/iptables/Makefile6
-rw-r--r--package/kernel.mk31
-rw-r--r--package/libpcap/Makefile2
-rw-r--r--package/linux-atm/Makefile2
-rw-r--r--package/madwifi/Makefile4
-rw-r--r--package/mini_fo/Makefile4
-rw-r--r--package/mtd/Makefile2
-rw-r--r--package/nvram/Makefile2
-rw-r--r--package/openssl/Makefile2
-rw-r--r--package/openswan/Makefile4
-rw-r--r--package/pcmcia-cs/Makefile2
-rw-r--r--package/ppp/Makefile2
-rw-r--r--package/pptp/Makefile2
-rw-r--r--package/robocfg/Makefile2
-rw-r--r--package/shfs/Makefile4
-rw-r--r--package/spca5xx/Makefile4
-rw-r--r--package/switch/Makefile4
-rw-r--r--package/udev/Makefile2
-rw-r--r--package/ueagle-atm/Makefile4
-rw-r--r--package/util-linux/Makefile2
-rw-r--r--package/wireless-tools/Makefile2
-rw-r--r--package/wlcompat/Makefile4
-rw-r--r--package/zd1211/Makefile4
-rw-r--r--package/zlib/Makefile2
-rw-r--r--target/Makefile9
-rw-r--r--target/linux/Config.in4
-rw-r--r--target/linux/Makefile1
-rw-r--r--target/linux/ar531x-2.4/Makefile5
-rw-r--r--target/linux/ar7-2.4/Makefile5
-rw-r--r--target/linux/aruba-2.6/Makefile7
-rw-r--r--target/linux/au1000-2.6/Makefile7
-rw-r--r--target/linux/brcm-2.4/Makefile5
-rw-r--r--target/linux/brcm-2.6/Makefile6
-rw-r--r--target/linux/image/ar7/Makefile2
-rw-r--r--target/linux/image/aruba/Makefile2
-rw-r--r--target/linux/image/au1000/Makefile2
-rw-r--r--target/linux/image/brcm/Makefile2
-rw-r--r--target/linux/image/generic/Makefile2
-rw-r--r--target/linux/image/image.mk55
-rw-r--r--target/linux/image/jffs2.mk30
-rw-r--r--target/linux/image/rb532/Makefile2
-rw-r--r--target/linux/image/squashfs.mk25
-rw-r--r--target/linux/image/tgz.mk3
-rw-r--r--target/linux/image/x86/Makefile2
-rw-r--r--target/linux/image/xscale/Makefile2
-rw-r--r--target/linux/rb532-2.6/Makefile6
-rw-r--r--target/linux/sibyte-2.6/Makefile7
-rw-r--r--target/linux/x86-2.4/Makefile7
-rw-r--r--target/linux/x86-2.6/Makefile7
-rw-r--r--target/linux/xscale-2.6/Makefile7
-rw-r--r--toolchain/Makefile3
-rw-r--r--toolchain/jffs2/Makefile (renamed from target/linux/image/jffs2/Makefile)0
-rw-r--r--toolchain/jffs2/patches/100-gcc4_fix.patch (renamed from target/linux/image/jffs2/patches/gcc4-fix.patch)0
-rw-r--r--toolchain/lzma/Makefile (renamed from target/lzma/Makefile)2
-rw-r--r--toolchain/lzma/patches/100-lzma_zlib.patch (renamed from target/lzma/lzma-zlib.patch)0
-rw-r--r--toolchain/squashfs/Makefile (renamed from target/linux/image/squashfs/Makefile)0
-rw-r--r--toolchain/squashfs/patches/100-lzma.patch (renamed from target/linux/image/squashfs/patches/100-lzma.patch)0
80 files changed, 204 insertions, 304 deletions
diff --git a/include/image.mk b/include/image.mk
new file mode 100644
index 000000000..f30f0997e
--- /dev/null
+++ b/include/image.mk
@@ -0,0 +1,77 @@
+include $(TOPDIR)/rules.mk
+
+KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
+
+ifneq ($(CONFIG_BIG_ENDIAN),y)
+JFFS2OPTS := --pad --little-endian --squash
+SQUASHFS_OPTS := -le
+else
+JFFS2OPTS := --pad --big-endian --squash
+SQUASHFS_OPTS := -be
+endif
+
+ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
+ ifeq ($(CONFIG_TARGET_ROOTFS_JFFS2),y)
+ define Image/mkfs/jffs2
+ rm -rf $(BUILD_DIR)/root/jffs
+
+ $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $(KDIR)/root.jffs2-64k -d $(BUILD_DIR)/root
+ $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $(KDIR)/root.jffs2-128k -d $(BUILD_DIR)/root
+
+ $(call Image/Build,jffs2-64k)
+ $(call Image/Build,jffs2-128k)
+ endef
+ endif
+
+ ifeq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),y)
+ define Image/mkfs/squashfs
+ @mkdir -p $(BUILD_DIR)/root/jffs
+ $(STAGING_DIR)/bin/mksquashfs-lzma $(BUILD_DIR)/root $(KDIR)/root.squashfs -nopad -noappend -root-owned $(SQUASHFS_OPTS)
+ $(call Image/Build,squashfs)
+ endef
+ endif
+
+ ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y)
+ define Image/mkfs/tgz
+ tar -zcf $(BIN_DIR)/openwrt-rootfs.tgz --owner=root --group=root -C $(BUILD_DIR)/root/ .
+ endef
+ endif
+endif
+
+define Image/mkfs/prepare/default
+ find $(BUILD_DIR)/root -type f -not -perm +0100 | xargs chmod 0644
+ find $(BUILD_DIR)/root -type f -perm +0100 | xargs chmod 0755
+ find $(BUILD_DIR)/root -type d | xargs chmod 0755
+ mkdir -p $(BUILD_DIR)/root/tmp
+ chmod 0777 $(BUILD_DIR)/root/tmp
+endef
+
+define Image/mkfs/prepare
+ $(call Image/mkfs/prepare/default)
+endef
+
+define BuildImage
+compile:
+ $(call Build/Compile)
+
+install:
+ $(call Image/Prepare)
+ $(call Image/mkfs/prepare)
+ $(call Image/BuildKernel)
+ $(call Image/mkfs/jffs2)
+ $(call Image/mkfs/squashfs)
+ $(call Image/mkfs/tgz)
+
+clean:
+ $(call Build/Clean)
+endef
+
+compile-targets:
+install-targets:
+clean-targets:
+
+source:
+prepare:
+compile: compile-targets
+install: compile install-targets
+clean: clean-targets
diff --git a/target/linux/kernel.mk b/include/kernel-build.mk
index cd74fccfb..9fbbe4504 100644
--- a/target/linux/kernel.mk
+++ b/include/kernel-build.mk
@@ -1,10 +1,14 @@
-LINUX_SOURCE:=$(LINUX_NAME).tar.bz2
+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:=$(LINUX_BUILD_DIR)/kernel-ipkg
+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)
@@ -19,8 +23,8 @@ $(DL_DIR)/$(LINUX_SOURCE):
$(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_SOURCE) $(LINUX_KERNEL_MD5SUM) $(LINUX_SITE)
$(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
- -mkdir -p $(LINUX_BUILD_DIR)
- bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(LINUX_BUILD_DIR) $(TAR_OPTIONS) -
+ -mkdir -p $(KERNEL_BUILD_DIR)
+ bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS) -
touch $@
ifeq ($(KERNEL),2.4)
@@ -65,14 +69,14 @@ $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
touch -c $(LINUX_KERNEL)
$(LINUX_DIR)/.modules_done:
- rm -rf $(LINUX_BUILD_DIR)/modules
+ 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=$(LINUX_BUILD_DIR)/modules modules_install
+ $(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 $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux
+ ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux
touch $@
$(KERNEL_IPKG):
@@ -82,11 +86,10 @@ $(KERNEL_IPKG):
if [ -f ./config/$(BOARD).modules ]; then \
cp ./config/$(BOARD).modules $(KERNEL_IDIR)/etc/modules; \
fi
- $(IPKG_BUILD) $(KERNEL_IDIR) $(LINUX_BUILD_DIR)
+ $(IPKG_BUILD) $(KERNEL_IDIR) $(KERNEL_BUILD_DIR)
-$(BUILD_DIR)/kernel.mk: $(LINUX_DIR) FORCE
+$(TOPDIR)/.kernel.mk:
echo "BOARD:=$(BOARD)" > $@
- echo "LINUX_NAME:=$(LINUX_NAME)" >> $@
echo "LINUX_VERSION:=$(LINUX_VERSION)" >> $@
echo "LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@
@@ -94,7 +97,7 @@ pkg-install: FORCE
@{ [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG) install $(INSTALL_TARGETS) || true; }
source: $(DL_DIR)/$(LINUX_SOURCE)
-prepare: $(BUILD_DIR)/kernel.mk
+prepare:
@mkdir -p $(STAMP_DIR) $(PACKAGE_DIR)
@$(MAKE) $(LINUX_DIR)/.configured
@@ -104,9 +107,9 @@ install: compile $(LINUX_KERNEL)
mostlyclean: FORCE
rm -f $(STAMP_DIR)/.linux-compile
- rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.modules_done
- rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.drivers-unpacked
- $(MAKE) -C $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) clean
+ 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
@@ -118,5 +121,5 @@ rebuild: FORCE
clean: FORCE
rm -f $(STAMP_DIR)/.linux-compile
- rm -rf $(LINUX_BUILD_DIR)
+ rm -rf $(KERNEL_BUILD_DIR)
rm -f $(TARGETS)
diff --git a/target/linux/rules.mk b/include/kernel.mk
index 166bfe24b..5c64ee4e1 100644
--- a/target/linux/rules.mk
+++ b/include/kernel.mk
@@ -1,22 +1,16 @@
+ifneq ($(DUMP),1)
+include $(TOPDIR)/.kernel.mk
+
KERNEL:=unknown
ifneq (,$(findstring 2.4.,$(LINUX_VERSION)))
KERNEL:=2.4
+LINUX_KMOD_SUFFIX=o
endif
ifneq (,$(findstring 2.6.,$(LINUX_VERSION)))
KERNEL:=2.6
+LINUX_KMOD_SUFFIX=ko
endif
-MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)
-
-LINUX_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
-ifeq ($(LINUX_NAME),)
-LINUX_NAME:=linux-$(LINUX_VERSION)
-endif
-LINUX_DIR := $(LINUX_BUILD_DIR)/$(LINUX_NAME)
-LINUX_KERNEL:=$(LINUX_BUILD_DIR)/vmlinux
-
-LINUX_TARGET_DIR:=$(LINUX_BUILD_DIR)/root
-
LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
-e 's/mipsel/mips/' \
-e 's/mipseb/mips/' \
@@ -25,16 +19,18 @@ LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
-e 's/armeb/arm/' \
)
-KMOD_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules
-MODULES_DIR := $(LINUX_BUILD_DIR)/modules/$(MODULES_SUBDIR)
+KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
+LINUX_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
+
+MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)
+MODULES_DIR := $(KERNEL_BUILD_DIR)/modules/$(MODULES_SUBDIR)
TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)
+KMOD_BUILD_DIR := $(KERNEL_BUILD_DIR)/linux-modules
-ifeq ($(KERNEL),2.6)
-LINUX_KMOD_SUFFIX=ko
-else
-LINUX_KMOD_SUFFIX=o
+LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux
endif
+# FIXME: remove this crap
define KMOD_template
ifeq ($$(strip $(4)),)
KDEPEND_$(1):=m
@@ -79,7 +75,3 @@ endif
$(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR)
endef
-KERNEL_IPKG:=$(LINUX_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_$(ARCH).ipk
-INSTALL_TARGETS := $(KERNEL_IPKG)
-TARGETS :=
-
diff --git a/target/linux/generic-2.4/modules.mk b/include/modules-2.4.mk
index 540ac715c..71864ad8e 100644
--- a/target/linux/generic-2.4/modules.mk
+++ b/include/modules-2.4.mk
@@ -1,4 +1,4 @@
-include ../netfilter.mk
+include $(TOPDIR)/include/netfilter.mk
# Networking
diff --git a/target/linux/generic-2.6/modules.mk b/include/modules-2.6.mk
index b582400bd..ec9f5da44 100644
--- a/target/linux/generic-2.6/modules.mk
+++ b/include/modules-2.6.mk
@@ -1,5 +1,5 @@
NF_2_6:=1
-include ../netfilter.mk
+include $(TOPDIR)/include/netfilter.mk
# Networking
diff --git a/target/linux/netfilter.mk b/include/netfilter.mk
index 66cb747de..66cb747de 100644
--- a/target/linux/netfilter.mk
+++ b/include/netfilter.mk
diff --git a/package/rules.mk b/include/package.mk
index 82298b024..82298b024 100644
--- a/package/rules.mk
+++ b/include/package.mk
diff --git a/package/alsa/Makefile b/package/alsa/Makefile
index b1b9997c1..5f6a3305b 100644
--- a/package/alsa/Makefile
+++ b/package/alsa/Makefile
@@ -1,7 +1,7 @@
# $Id$
include $(TOPDIR)/rules.mk
-include $(TOPDIR)/package/kernel.mk
+include $(TOPDIR)/include/kernel.mk
PKG_NAME:=alsa-driver
PKG_VERSION:=1.0.11
@@ -13,7 +13,7 @@ PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/driver/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_CAT:=bzcat
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
ifeq ($(LINUX_KARCH),i386)
KERNEL_C_INCS:= -I$(LINUX_DIR)/include/asm-i386/mach-generic -I$(LINUX_DIR)/include/asm-i386/mach-default
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index ec3dc8892..bb2089409 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -1,7 +1,7 @@
# $Id$
include $(TOPDIR)/rules.mk
-include $(TOPDIR)/package/kernel.mk
+include $(TOPDIR)/include/kernel.mk
PKG_NAME:=base-files
PKG_RELEASE:=8
@@ -12,7 +12,7 @@ ifeq ($(REV),)
REV:=0
endif
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
ifneq ($(DUMP),1)
TARGET:=-$(BOARD)-$(KERNEL)
diff --git a/package/bridge/Makefile b/package/bridge/Makefile
index 65fd8358e..f2b178a61 100644
--- a/package/bridge/Makefile
+++ b/package/bridge/Makefile
@@ -12,7 +12,7 @@ PKG_SOURCE_URL:=@SF/bridge
PKG_MD5SUM:=9b7dc52656f5cbec846a7ba3299f73bd
PKG_CAT:=zcat
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/bridge
SECTION:=base
diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index 227352b15..6fe22edb0 100644
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -1,7 +1,7 @@
# $Id: Makefile 2480 2005-11-14 02:07:33Z nbd $
include $(TOPDIR)/rules.mk
-include $(TOPDIR)/package/kernel.mk
+include $(TOPDIR)/include/kernel.mk
PKG_NAME:=broadcom-wl
PKG_VERSION:=4.80.9.2
@@ -14,7 +14,7 @@ PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
PKG_MD5SUM:=7d9fab2c611369bbe075c3924ea77450
PKG_CAT:=bzcat
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/kmod-brcm-wl
SECTION:=drivers
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index aac9d21e3..6b2e0c5be 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -12,7 +12,7 @@ PKG_SOURCE_URL:=http://www.busybox.net/downloads
PKG_MD5SUM:=19a0b475169335f17e421cf644616fe7
PKG_CAT:=bzcat
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/busybox
SECTION:=base
diff --git a/package/diag/Makefile b/package/diag/Makefile
index 6fed3b51b..ab28e7218 100644
--- a/package/diag/Makefile
+++ b/package/diag/Makefile
@@ -1,14 +1,14 @@
# $Id$
include $(TOPDIR)/rules.mk
-include $(TOPDIR)/package/kernel.mk
+include $(TOPDIR)/include/kernel.mk
PKG_NAME:=kmod-diag
PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/kmod-diag
SECTION:=drivers
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 6efaf370a..a05ec0e22 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -12,7 +12,7 @@ PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
PKG_MD5SUM:=489198ec87101087043adc98bbe062dc
PKG_CAT:=zcat
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/dnsmasq
SECTION:=base
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index bda4d8fc9..0409e66db 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -12,7 +12,7 @@ PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/
PKG_MD5SUM:=ca8e53a766faec831882831364568421
PKG_CAT:=zcat
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/dropbear
SECTION:=base
diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile
index f4359a667..814ac68a2 100644
--- a/package/ebtables/Makefile
+++ b/package/ebtables/Makefile
@@ -12,7 +12,7 @@ PKG_SOURCE_URL:=@SF/ebtables
PKG_MD5SUM:=f07111fcc1966be669278433c35dcc28
PKG_CAT:=zcat
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/ebtables
SECTION:=base
diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 91d4dd607..b7084236d 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -1,7 +1,7 @@
# $Id$
include $(TOPDIR)/rules.mk
-include $(TOPDIR)/package/kernel.mk
+include $(TOPDIR)/include/kernel.mk
PKG_NAME:=fuse
PKG_VERSION:=2.5.3
@@ -15,7 +15,7 @@ PKG_CAT:=zcat
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/kmod-fuse
SECTION:=drivers
diff --git a/package/haserl/Makefile b/package/haserl/Makefile
index e6215c954..ec940ea43 100644
--- a/package/haserl/Makefile
+++ b/package/haserl/Makefile
@@ -12,7 +12,7 @@ PKG_SOURCE_URL:=@SF/haserl
PKG_MD5SUM:=bd9195d086566f56634c0bcbbbcbebea
PKG_CAT:=zcat
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/haserl
SECTION:=base
diff --git a/package/hostap/Makefile b/package/hostap/Makefile
index 80f820187..21abfe256 100644
--- a/package/hostap/Makefile
+++ b/package/hostap/Makefile
@@ -1,7 +1,7 @@
# $Id$
include $(TOPDIR)/rules.mk
-include $(TOPDIR)/package/kernel.mk
+include $(TOPDIR)/include/kernel.mk
PKG_NAME:=hostap-driver
PKG_VERSION:=0.4.9
@@ -15,7 +15,7 @@ PKG_CAT:=zcat
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/kmod-hostap
SECTION:=drivers
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index 4a1c3f926..867cda692 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -14,7 +14,7 @@ PKG_CAT:=zcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/hostapd
SECTION:=net
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index 1fa638d39..9cf1eb990 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -12,7 +12,7 @@ PKG_SOURCE_URL:=http://developer.osdl.org/dev/iproute2/download/
PKG_MD5SUM:=04f57a6d366d36426d276178b600f5c5
PKG_CAT:=zcat
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/ip
SECTION:=base
diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile
index 58dccca62..667884deb 100644
--- a/package/ipsec-tools/Makefile
+++ b/package/ipsec-tools/Makefile
@@ -14,7 +14,7 @@ PKG_CAT:=bzcat
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/ipsec-tools
SECTION:=base
diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index 456f8b6be..d245090a6 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -12,7 +12,7 @@ PKG_SOURCE_URL:=http://ipset.netfilter.org
PKG_MD5SUM:=1709424cc2cdb925d4fb6fd5fcaefc26
PKG_CAT:=bzcat
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/ipset
SECTION:=base
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 623a64ed8..749027744 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -1,7 +1,7 @@
# $Id$
include $(TOPDIR)/rules.mk
-include $(TOPDIR)/package/kernel.mk
+include $(TOPDIR)/include/kernel.mk
PKG_NAME:=iptables
PKG_VERSION:=1.3.5
@@ -20,10 +20,10 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
PKG_MENU:=IPv4 / IPv6 firewall administration
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
ifeq ($(DUMP),)
include $(LINUX_DIR)/.config
-include $(TOPDIR)/target/linux/netfilter.mk
+include $(TOPDIR)/include/netfilter.mk
endif
define Package/iptables
diff --git a/package/kernel.mk b/package/kernel.mk
deleted file mode 100644
index 39f9cc0c9..000000000
--- a/package/kernel.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-ifneq ($(DUMP),1)
-include $(BUILD_DIR)/kernel.mk
-
-KERNEL:=unknown
-ifneq (,$(findstring 2.4.,$(LINUX_VERSION)))
-KERNEL:=2.4
-LINUX_KMOD_SUFFIX=o
-endif
-ifneq (,$(findstring 2.6.,$(LINUX_VERSION)))
-KERNEL:=2.6
-LINUX_KMOD_SUFFIX=ko
-endif
-
-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/' \
-)
-
-KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
-ifeq ($(LINUX_NAME),)
-LINUX_NAME:=linux-$(LINUX_VERSION)
-endif
-LINUX_DIR := $(KERNEL_BUILD_DIR)/$(LINUX_NAME)
-
-KMOD_BUILD_DIR := $(KERNEL_BUILD_DIR)/linux-modules
-MODULES_DIR := $(KERNEL_BUILD_DIR)/modules/$(MODULES_SUBDIR)
-TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)
-endif
diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index d4d7e2167..2d7aecf55 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -14,7 +14,7 @@ PKG_CAT:=zcat
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/libpcap
SECTION:=base
diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index e37d5bdce..15b3f7d4d 100644
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -14,7 +14,7 @@ PKG_CAT:=zcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/linux-atm
SECTION:=libs
diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index c68905481..7bdb7ec11 100644
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@@ -1,7 +1,7 @@
# $Id$
include $(TOPDIR)/rules.mk
-include $(TOPDIR)/package/kernel.mk
+include $(TOPDIR)/include/kernel.mk
PKG_NAME:=madwifi
PKG_VERSION:=0.9.0
@@ -54,7 +54,7 @@ MADWIFI_MAKEOPTS= -C $(PKG_BUILD_DIR) \
LDOPTS="" \
DOMULTI=1
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
ifeq ($(findstring AHB,$(BUS)),AHB)
define Build/Compile/ahb
diff --git a/package/mini_fo/Makefile b/package/mini_fo/Makefile
index f2c46c9ec..0180f81c3 100644
--- a/package/mini_fo/Makefile
+++ b/package/mini_fo/Makefile
@@ -1,7 +1,7 @@
# $Id$
include $(TOPDIR)/rules.mk
-include $(TOPDIR)/package/kernel.mk
+include $(TOPDIR)/include/kernel.mk
PKG_NAME:=mini_fo
PKG_VERSION:=0.6.2pre1
@@ -13,7 +13,7 @@ PKG_SOURCE_URL:=http://www.denx.de/twiki/pub/Know/MiniFOHome/
PKG_SOURCE:=mini_fo-0-6-2-pre1.tar.bz2
PKG_CAT:=bzcat
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/kmod-mini-fo
SECTION:=drivers
diff --git a/package/mtd/Makefile b/package/mtd/Makefile
index f6e94303a..01dfcd6b5 100644
--- a/package/mtd/Makefile
+++ b/package/mtd/Makefile
@@ -7,7 +7,7 @@ PKG_RELEASE:=4
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/mtd
SECTION:=base
diff --git a/package/nvram/Makefile b/package/nvram/Makefile
index 019800a0c..cf76c7c81 100644
--- a/package/nvram/Makefile
+++ b/package/nvram/Makefile
@@ -7,7 +7,7 @@ PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/nvram
SECTION:=base
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 82f20d6b0..39fe6b4c3 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -20,7 +20,7 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-rmd160 no-aes192
OPENSSL_OPTIONS:= shared no-ec no-err no-fips no-hw no-krb5 no-threads zlib-dynamic no-engines
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/libopenssl
SECTION:=base
diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 4a1a42cc0..f81096547 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -1,7 +1,7 @@
# $Id$
include $(TOPDIR)/rules.mk
-include $(TOPDIR)/package/kernel.mk
+include $(TOPDIR)/include/kernel.mk
PKG_NAME:=openswan
PKG_VERSION:=2.4.5
@@ -13,7 +13,7 @@ PKG_SOURCE_URL:=http://www.openswan.org/download
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_CAT:=zcat
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/kmod-openswan
SECTION:=drivers
diff --git a/package/pcmcia-cs/Makefile b/package/pcmcia-cs/Makefile
index a389fd63e..2c7b22978 100644
--- a/package/pcmcia-cs/Makefile
+++ b/package/pcmcia-cs/Makefile
@@ -14,7 +14,7 @@ PKG_CAT:=zcat
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/pcmcia-cs
SECTION:=base
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 55986f95c..edd9a5ea8 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -15,7 +15,7 @@ PKG_CAT:=zcat
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/ppp
SECTION:=net
diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index 08cb43a7c..6d01ce19f 100644
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -12,7 +12,7 @@ PKG_SOURCE_URL:=@SF/pptpclient
PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631
PKG_CAT:=zcat
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/pptp
SECTION:=base
diff --git a/package/robocfg/Makefile b/package/robocfg/Makefile
index 49f600569..ca0f83d3d 100644
--- a/package/robocfg/Makefile
+++ b/package/robocfg/Makefile
@@ -8,7 +8,7 @@ PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/robocfg
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/robocfg
SECTION:=base
diff --git a/package/shfs/Makefile b/package/shfs/Makefile
index 69f8d83a4..057358b34 100644
--- a/package/shfs/Makefile
+++ b/package/shfs/Makefile
@@ -1,7 +1,7 @@
# $Id$
include $(TOPDIR)/rules.mk
-include $(TOPDIR)/package/kernel.mk
+include $(TOPDIR)/include/kernel.mk
PKG_NAME:=shfs
PKG_VERSION:=0.35
@@ -15,7 +15,7 @@ PKG_CAT:=zcat
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/kmod-shfs
SECTION:=drivers
diff --git a/package/spca5xx/Makefile b/package/spca5xx/Makefile
index 93eea633c..86233fc64 100644
--- a/package/spca5xx/Makefile
+++ b/package/spca5xx/Makefile
@@ -1,7 +1,7 @@
# $Id$
include $(TOPDIR)/rules.mk
-include $(TOPDIR)/package/kernel.mk
+include $(TOPDIR)/include/kernel.mk
PKG_NAME:=spca5xx
PKG_VERSION:=20060301
@@ -13,7 +13,7 @@ PKG_SOURCE_URL:=http://mxhaard.free.fr/spca50x/Download/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_CAT:=zcat
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
#FIXME: add proper dependency handling on kmod-usb-core & kmod-videodev packages
define Package/kmod-spca5xx
diff --git a/package/switch/Makefile b/package/switch/Makefile
index e8aa6a02a..cb5f34674 100644
--- a/package/switch/Makefile
+++ b/package/switch/Makefile
@@ -1,14 +1,14 @@
# $Id$
include $(TOPDIR)/rules.mk
-include $(TOPDIR)/package/kernel.mk
+include $(TOPDIR)/include/kernel.mk
PKG_NAME:=kmod-switch
PKG_RELEASE:=1
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/kmod-switch
SECTION:=drivers
diff --git a/package/udev/Makefile b/package/udev/Makefile
index 54e06dcff..5d397161b 100644
--- a/package/udev/Makefile
+++ b/package/udev/Makefile
@@ -19,7 +19,7 @@ PKG_CAT:=bzcat
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/udev
SECTION:=base
diff --git a/package/ueagle-atm/Makefile b/package/ueagle-atm/Makefile
index 6f227a1bf..6d003f6c0 100644
--- a/package/ueagle-atm/Makefile
+++ b/package/ueagle-atm/Makefile
@@ -1,7 +1,7 @@
# $Id: Makefile 2767 2005-12-25 02:10:14Z wbx $
include $(TOPDIR)/rules.mk
-include $(TOPDIR)/package/kernel.mk
+include $(TOPDIR)/include/kernel.mk
PKG_NAME:=ueagle-atm
PKG_VERSION:=1.0d1
@@ -15,7 +15,7 @@ PKG_CAT:=zcat
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
#FIXME: add dependency on kmod-usb-core
define Package/kmod-ueagle-atm
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index ef28bdb69..673ade433 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -16,7 +16,7 @@ PKG_CAT:=zcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/fdisk
SECTION:=base
diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile
index ad4eddab8..368d3ebb0 100644
--- a/package/wireless-tools/Makefile
+++ b/package/wireless-tools/Makefile
@@ -14,7 +14,7 @@ PKG_CAT:=zcat
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/wireless-tools
SECTION:=base
diff --git a/package/wlcompat/Makefile b/package/wlcompat/Makefile
index af1f07593..d5feede6c 100644
--- a/package/wlcompat/Makefile
+++ b/package/wlcompat/Makefile
@@ -1,14 +1,14 @@
# $Id$
include $(TOPDIR)/rules.mk
-include $(TOPDIR)/package/kernel.mk
+include $(TOPDIR)/include/kernel.mk
PKG_NAME:=kmod-wlcompat
PKG_RELEASE:=3
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/kmod-wlcompat
SECTION:=drivers
diff --git a/package/zd1211/Makefile b/package/zd1211/Makefile
index a71873b9f..1c79922cf 100644
--- a/package/zd1211/Makefile
+++ b/package/zd1211/Makefile
@@ -1,7 +1,7 @@
# $Id: Makefile 3297 2006-03-02 23:42:52Z florian $
include $(TOPDIR)/rules.mk
-include $(TOPDIR)/package/kernel.mk
+include $(TOPDIR)/include/kernel.mk
PKG_NAME:=zd1211
PKG_VERSION:=r69
@@ -13,7 +13,7 @@ PKG_SOURCE_URL:=http://zd1211.ath.cx/download/
PKG_SOURCE:=$(PKG_NAME)-driver-$(PKG_VERSION).tgz
PKG_CAT:=zcat
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
#FIXME: add proper dependency handling on kmod-usb-core packages
define Package/kmod-zd1211
diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 02659bb9a..8e497c2f2 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -14,7 +14,7 @@ PKG_CAT:=bzcat
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
define Package/zlib
SECTION:=base
diff --git a/target/Makefile b/target/Makefile
index d64053cbd..9205f5b98 100644
--- a/target/Makefile
+++ b/target/Makefile
@@ -5,9 +5,9 @@ all: install
$(BIN_DIR):
mkdir -p $(BIN_DIR)
-TARGETS:=linux utils lzma
+TARGETS:=linux utils
-linux-compile: utils-install lzma-install
+linux-compile: utils-install
linux-install: $(BIN_DIR)
download: $(patsubst %,%-source,$(TARGETS))
@@ -27,11 +27,6 @@ image_clean: FORCE
$(MAKE) -C $(patsubst %-prepare,%,$@) prepare
%-compile: %-prepare
$(MAKE) -C $(patsubst %-compile,%,$@) compile
-%-rebuild: FORCE
- $(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
%-install: %-compile
$(MAKE) -C $(patsubst %-install,%,$@) install
-linux-imagebuilder: FORCE
- $(MAKE) -C linux imagebuilder
-
diff --git a/target/linux/Config.in b/target/linux/Config.in
index 946ace320..23c96b76d 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -13,8 +13,8 @@ menu "Target Root Filesystem"
help
Build a jffs2 root filesystem
- config TARGET_ROOTFS_SQUASHFS_LZMA
- bool "squashfs-lzma"
+ config TARGET_ROOTFS_SQUASHFS
+ bool "squashfs"
default y
depends !LINUX_2_6_ARUBA
depends !LINUX_2_6_XSCALE
diff --git a/target/linux/Makefile b/target/linux/Makefile
index 2caee31b3..e1a314d1d 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -30,6 +30,7 @@ source:
$(MAKE) -C image/$(BOARD) source
prepare:
+ rm -f $(TOPDIR)/.kernel.mk
$(MAKE) -C $(BOARD)-$(KERNEL) prepare
compile:
diff --git a/target/linux/ar531x-2.4/Makefile b/target/linux/ar531x-2.4/Makefile
index 3abb30d48..96a32848e 100644
--- a/target/linux/ar531x-2.4/Makefile
+++ b/target/linux/ar531x-2.4/Makefile
@@ -4,10 +4,9 @@ LINUX_VERSION:=2.4.32
LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c
-include ../rules.mk
include ./config
-include ../generic-$(KERNEL)/modules.mk
-include ../kernel.mk
+include $(TOPDIR)/include/kernel.mk
+include $(TOPDIR)/include/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
[ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches
diff --git a/target/linux/ar7-2.4/Makefile b/target/linux/ar7-2.4/Makefile
index 20ad3523a..c8688da04 100644
--- a/target/linux/ar7-2.4/Makefile
+++ b/target/linux/ar7-2.4/Makefile
@@ -4,8 +4,8 @@ LINUX_VERSION:=2.4.32
LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c
-include ../rules.mk
include ./config
+include $(TOPDIR)/include/kernel.mk
ATM_FIRMWARE_VERSION:=0.4
ATM_FIRMWARE_DIR=sangam-atm-firmware-$(ATM_FIRMWARE_VERSION)
@@ -26,8 +26,7 @@ $(eval $(call KMOD_template,CPMAC,cpmac,\
$(MODULES_DIR)/kernel/drivers/net/avalanche_cpmac/avalanche_cpmac.o \
,CONFIG_MIPS_AVALANCHE_CPMAC,,10,avalanche_cpmac))
-include ../generic-$(KERNEL)/modules.mk
-include ../kernel.mk
+include $(TOPDIR)/include/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
diff --git a/target/linux/aruba-2.6/Makefile b/target/linux/aruba-2.6/Makefile
index 1f6861425..652e4b913 100644
--- a/target/linux/aruba-2.6/Makefile
+++ b/target/linux/aruba-2.6/Makefile
@@ -4,12 +4,9 @@ LINUX_VERSION:=2.6.17
LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
-include ../rules.mk
include ./config
-
-include ../generic-$(KERNEL)/modules.mk
-include ../kernel.mk
-
+include $(TOPDIR)/include/kernel.mk
+include $(TOPDIR)/include/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
[ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE)
diff --git a/target/linux/au1000-2.6/Makefile b/target/linux/au1000-2.6/Makefile
index 39d8d4c8b..b1ca0fee3 100644
--- a/target/linux/au1000-2.6/Makefile
+++ b/target/linux/au1000-2.6/Makefile
@@ -4,12 +4,9 @@ LINUX_VERSION:=2.6.17
LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
-include ../rules.mk
include ./config
-
-include ../generic-$(KERNEL)/modules.mk
-include ../kernel.mk
-
+include $(TOPDIR)/include/kernel.mk
+include $(TOPDIR)/include/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
[ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches
diff --git a/target/linux/brcm-2.4/Makefile b/target/linux/brcm-2.4/Makefile
index 022f3352c..20a621066 100644
--- a/target/linux/brcm-2.4/Makefile
+++ b/target/linux/brcm-2.4/Makefile
@@ -4,8 +4,8 @@ LINUX_VERSION:=2.4.32
LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c
-include ../rules.mk
include ./config
+include $(TOPDIR)/include/kernel.mk
# broadcom specific kmod packages
$(eval $(call KMOD_template,LP,lp,\
@@ -15,8 +15,7 @@ $(eval $(call KMOD_template,LP,lp,\
$(MODULES_DIR)/kernel/drivers/char/ppdev.o \
,CONFIG_PARPORT,,50,parport parport_splink lp))
-include ../generic-$(KERNEL)/modules.mk
-include ../kernel.mk
+include $(TOPDIR)/include/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
diff --git a/target/linux/brcm-2.6/Makefile b/target/linux/brcm-2.6/Makefile
index 1f6861425..a3b8177c2 100644
--- a/target/linux/brcm-2.6/Makefile
+++ b/target/linux/brcm-2.6/Makefile
@@ -4,11 +4,9 @@ LINUX_VERSION:=2.6.17
LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
-include ../rules.mk
include ./config
-
-include ../generic-$(KERNEL)/modules.mk
-include ../kernel.mk
+include $(TOPDIR)/include/kernel.mk
+include $(TOPDIR)/include/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
diff --git a/target/linux/image/ar7/Makefile b/target/linux/image/ar7/Makefile
index 4ac6d3015..4b22f90df 100644
--- a/target/linux/image/ar7/Makefile
+++ b/target/linux/image/ar7/Makefile
@@ -1,4 +1,4 @@
-include ../image.mk
+include $(TOPDIR)/include/image.mk
PKG_BUILD_DIR:=$(BUILD_DIR)/ar7loader
diff --git a/target/linux/image/aruba/Makefile b/target/linux/image/aruba/Makefile
index c8dab056a..5091d3f40 100644
--- a/target/linux/image/aruba/Makefile
+++ b/target/linux/image/aruba/Makefile
@@ -1,4 +1,4 @@
-include ../image.mk
+include $(TOPDIR)/include/image.mk
LOADADDR = 0x81000000 # RAM start + 16M
KERNEL_ENTRY = 0x80100000
diff --git a/target/linux/image/au1000/Makefile b/target/linux/image/au1000/Makefile
index 2607ed9eb..682670a22 100644
--- a/target/linux/image/au1000/Makefile
+++ b/target/linux/image/au1000/Makefile
@@ -1,4 +1,4 @@
-include ../image.mk
+include $(TOPDIR)/include/image.mk
LOADADDR = 0x8108c8f4 # RAM start + 16M
KERNEL_ENTRY = 0x80100000 # Default kernel entry in arch/mips/Makefile
diff --git a/target/linux/image/brcm/Makefile b/target/linux/image/brcm/Makefile
index df2a42ea5..d219dc354 100644
--- a/target/linux/image/brcm/Makefile
+++ b/target/linux/image/brcm/Makefile
@@ -1,4 +1,4 @@
-include ../image.mk
+include $(TOPDIR)/include/image.mk
define Build/Compile
rm -f $(KDIR)/loader.gz
diff --git a/target/linux/image/generic/Makefile b/target/linux/image/generic/Makefile
index f87fb116d..b9efc95b9 100644
--- a/target/linux/image/generic/Makefile
+++ b/target/linux/image/generic/Makefile
@@ -1,4 +1,4 @@
-include ../image.mk
+include $(TOPDIR)/include/image.mk
# use default targets for everything
diff --git a/target/linux/image/image.mk b/target/linux/image/image.mk
deleted file mode 100644
index 92143d64e..000000000
--- a/target/linux/image/image.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
-
-ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
-ifeq ($(CONFIG_TARGET_ROOTFS_JFFS2),y)
-include $(TOPDIR)/target/linux/image/jffs2.mk
-endif
-
-ifeq ($(CONFIG_TARGET_ROOTFS_SQUASHFS_LZMA),y)
-include $(TOPDIR)/target/linux/image/squashfs.mk
-endif
-
-ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y)
-include $(TOPDIR)/target/linux/image/tgz.mk
-endif
-endif
-
-define Image/mkfs/prepare/default
- find $(BUILD_DIR)/root -type f -not -perm +0100 | xargs chmod 0644
- find $(BUILD_DIR)/root -type f -perm +0100 | xargs chmod 0755
- find $(BUILD_DIR)/root -type d | xargs chmod 0755
- mkdir -p $(BUILD_DIR)/root/tmp
- chmod 0777 $(BUILD_DIR)/root/tmp
-endef
-
-define Image/mkfs/prepare
- $(call Image/mkfs/prepare/default)
-endef
-
-define BuildImage
-compile:
- $(call Build/Compile)
-
-install:
- $(call Image/Prepare)
- $(call Image/mkfs/prepare)
- $(call Image/BuildKernel)
- $(call Image/mkfs/jffs2)
- $(call Image/mkfs/squashfs)
- $(call Image/mkfs/tgz)
-
-clean:
- $(call Build/Clean)
-endef
-
-compile-targets:
-install-targets:
-clean-targets:
-
-source:
-prepare:
-compile: compile-targets
-install: compile install-targets
-clean: clean-targets
diff --git a/target/linux/image/jffs2.mk b/target/linux/image/jffs2.mk
deleted file mode 100644
index a0e14daa9..000000000
--- a/target/linux/image/jffs2.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-ifneq ($(CONFIG_BIG_ENDIAN),y)
-JFFS2OPTS := --pad --little-endian --squash
-else
-JFFS2OPTS := --pad --big-endian --squash
-endif
-
-define Image/mkfs/jffs2
- rm -rf $(BUILD_DIR)/root/jffs
-
- $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $(KDIR)/root.jffs2-64k -d $(BUILD_DIR)/root
- $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $(KDIR)/root.jffs2-128k -d $(BUILD_DIR)/root
-
- $(call Image/Build,jffs2-64k)
- $(call Image/Build,jffs2-128k)
-endef
-
-jffs2-source: FORCE
- $(MAKE) -C $(TOPDIR)/target/linux/image/jffs2 source
-
-$(STAGING_DIR)/bin/mkfs.jffs2:
- $(MAKE) -C $(TOPDIR)/target/linux/image/jffs2 compile
-
-jffs2-clean: FORCE
- $(MAKE) -C $(TOPDIR)/target/linux/image/jffs2 clean
- rm -f $(KDIR)/root.jffs2*
-
-source: jffs2-source
-compile-targets: $(STAGING_DIR)/bin/mkfs.jffs2
-clean-targets: jffs2-clean
-
diff --git a/target/linux/image/rb532/Makefile b/target/linux/image/rb532/Makefile
index ed419c8c6..53adfc432 100644
--- a/target/linux/image/rb532/Makefile
+++ b/target/linux/image/rb532/Makefile
@@ -1,4 +1,4 @@
-include ../image.mk
+include $(TOPDIR)/include/image.mk
LOADADDR = 0x81000000 # RAM start + 16M
KERNEL_ENTRY = 0x80101000
diff --git a/target/linux/image/squashfs.mk b/target/linux/image/squashfs.mk
deleted file mode 100644
index e01766c0c..000000000
--- a/target/linux/image/squashfs.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-ifneq ($(CONFIG_BIG_ENDIAN),y)
-ENDIAN := le
-else
-ENDIAN := be
-endif
-
-squashfs-source: FORCE
- $(MAKE) -C $(TOPDIR)/target/linux/image/squashfs source
-
-$(STAGING_DIR)/bin/mksquashfs-lzma:
- $(MAKE) -C $(TOPDIR)/target/linux/image/squashfs compile
-
-squashfs-clean: FORCE
- $(MAKE) -C $(TOPDIR)/target/linux/image/squashfs clean
- rm -f $(KDIR)/root.squashfs
-
-define Image/mkfs/squashfs
- @mkdir -p $(BUILD_DIR)/root/jffs
- $(STAGING_DIR)/bin/mksquashfs-lzma $(BUILD_DIR)/root $(KDIR)/root.squashfs -nopad -noappend -root-owned -$(ENDIAN)
- $(call Image/Build,squashfs)
-endef
-
-FILESYSTEMS += squashfs
-compile-targets: $(STAGING_DIR)/bin/mksquashfs-lzma
-clean-targets: squashfs-clean
diff --git a/target/linux/image/tgz.mk b/target/linux/image/tgz.mk
deleted file mode 100644
index 39adb6925..000000000
--- a/target/linux/image/tgz.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-define Image/mkfs/tgz
- tar -zcf $(BIN_DIR)/openwrt-rootfs.tgz --owner=root --group=root -C $(BUILD_DIR)/root/ .
-endef
diff --git a/target/linux/image/x86/Makefile b/target/linux/image/x86/Makefile
index 69f9bf470..d76294f15 100644
--- a/target/linux/image/x86/Makefile
+++ b/target/linux/image/x86/Makefile
@@ -1,4 +1,4 @@
-include ../image.mk
+include $(TOPDIR)/include/image.mk
define Image/Build
cp $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img
diff --git a/target/linux/image/xscale/Makefile b/target/linux/image/xscale/Makefile
index 09616d409..d94d7f07c 100644
--- a/target/linux/image/xscale/Makefile
+++ b/target/linux/image/xscale/Makefile
@@ -1,4 +1,4 @@
-include ../image.mk
+include $(TOPDIR)/include/image.mk
define Image/Build
ifneq ($(FS),jffs2-64k)
diff --git a/target/linux/rb532-2.6/Makefile b/target/linux/rb532-2.6/Makefile
index 9bb7bba71..4b0901987 100644
--- a/target/linux/rb532-2.6/Makefile
+++ b/target/linux/rb532-2.6/Makefile
@@ -4,11 +4,9 @@ LINUX_VERSION:=2.6.17
LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
-include ../rules.mk
include ./config
-
-include ../generic-$(KERNEL)/modules.mk
-include ../kernel.mk
+include $(TOPDIR)/include/kernel.mk
+include $(TOPDIR)/include/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
[ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches
diff --git a/target/linux/sibyte-2.6/Makefile b/target/linux/sibyte-2.6/Makefile
index 210c195ad..4b0901987 100644
--- a/target/linux/sibyte-2.6/Makefile
+++ b/target/linux/sibyte-2.6/Makefile
@@ -4,12 +4,9 @@ LINUX_VERSION:=2.6.17
LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
-include ../rules.mk
include ./config
-
-include ../generic-$(KERNEL)/modules.mk
-include ../kernel.mk
-
+include $(TOPDIR)/include/kernel.mk
+include $(TOPDIR)/include/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
[ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches
diff --git a/target/linux/x86-2.4/Makefile b/target/linux/x86-2.4/Makefile
index bcc8bd05d..a6208dbbb 100644
--- a/target/linux/x86-2.4/Makefile
+++ b/target/linux/x86-2.4/Makefile
@@ -4,17 +4,14 @@ LINUX_VERSION:=2.4.32
LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c
-include ../rules.mk
include ./config
+include $(TOPDIR)/include/kernel.mk
$(eval $(call KMOD_template,WD1100,wd1100,\
$(MODULES_DIR)/kernel/drivers/char/wd1100.o \
,CONFIG_WD1100))
-
-include ../generic-$(KERNEL)/modules.mk
-include ../kernel.mk
-
+include $(TOPDIR)/include/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
[ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches
diff --git a/target/linux/x86-2.6/Makefile b/target/linux/x86-2.6/Makefile
index 7b2f1b068..ab88d58df 100644
--- a/target/linux/x86-2.6/Makefile
+++ b/target/linux/x86-2.6/Makefile
@@ -4,12 +4,9 @@ LINUX_VERSION:=2.6.17
LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
-include ../rules.mk
include ./config
-
-include ../generic-$(KERNEL)/modules.mk
-include ../kernel.mk
-
+include $(TOPDIR)/include/kernel.mk
+include $(TOPDIR)/include/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
[ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches
diff --git a/target/linux/xscale-2.6/Makefile b/target/linux/xscale-2.6/Makefile
index 608a49408..a4d93efc5 100644
--- a/target/linux/xscale-2.6/Makefile
+++ b/target/linux/xscale-2.6/Makefile
@@ -4,12 +4,9 @@ LINUX_VERSION:=2.6.17
LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
-include ../rules.mk
include ./config
-
-include ../generic-$(KERNEL)/modules.mk
-include ../kernel.mk
-
+include $(TOPDIR)/include/kernel.mk
+include $(TOPDIR)/include/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
[ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches
diff --git a/toolchain/Makefile b/toolchain/Makefile
index fac046828..f9fb3a54d 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -1,6 +1,6 @@
# Main makefile for the toolchain
include $(TOPDIR)/rules.mk
-TARGETS-y:=sed kernel-headers utils binutils gcc uClibc ipkg-utils libnotimpl
+TARGETS-y:=sed kernel-headers utils binutils gcc uClibc ipkg-utils libnotimpl squashfs jffs2 lzma
TARGETS-$(CONFIG_GDB) += gdb
TARGETS_DOWNLOAD:=$(patsubst %,%-source,$(TARGETS-y))
@@ -17,6 +17,7 @@ binutils-prepare: uClibc-prepare
gcc-prepare: binutils-install
uClibc-compile: gcc-prepare
gcc-compile: uClibc-install
+squashfs-compile: lzma-compile
TOOLCHAIN_STAMP_DIR:=$(STAGING_DIR)/stampfiles
diff --git a/target/linux/image/jffs2/Makefile b/toolchain/jffs2/Makefile
index b673c438a..b673c438a 100644
--- a/target/linux/image/jffs2/Makefile
+++ b/toolchain/jffs2/Makefile
diff --git a/target/linux/image/jffs2/patches/gcc4-fix.patch b/toolchain/jffs2/patches/100-gcc4_fix.patch
index 50c8edb47..50c8edb47 100644
--- a/target/linux/image/jffs2/patches/gcc4-fix.patch
+++ b/toolchain/jffs2/patches/100-gcc4_fix.patch
diff --git a/target/lzma/Makefile b/toolchain/lzma/Makefile
index 214967a15..cace2a4e2 100644
--- a/target/lzma/Makefile
+++ b/toolchain/lzma/Makefile
@@ -22,7 +22,7 @@ $(DL_DIR)/$(LZMA_SOURCE):
$(LZMA_DIR)/.unpacked: $(DL_DIR)/$(LZMA_SOURCE)
@rm -rf $(LZMA_DIR) && mkdir -p $(LZMA_DIR)
tar xjf $^ -C $(LZMA_DIR)
- patch -d $(LZMA_DIR) -p1 < lzma-zlib.patch
+ $(PATCH) $(LZMA_DIR) ./patches
touch $(LZMA_DIR)/.unpacked
$(LZMA_ALONE_DIR)/lzma $(LZMA_LIB_DIR)/liblzma.a: $(LZMA_DIR)/.built
diff --git a/target/lzma/lzma-zlib.patch b/toolchain/lzma/patches/100-lzma_zlib.patch
index 3672a0efb..3672a0efb 100644
--- a/target/lzma/lzma-zlib.patch
+++ b/toolchain/lzma/patches/100-lzma_zlib.patch
diff --git a/target/linux/image/squashfs/Makefile b/toolchain/squashfs/Makefile
index a2b367187..a2b367187 100644
--- a/target/linux/image/squashfs/Makefile
+++ b/toolchain/squashfs/Makefile
diff --git a/target/linux/image/squashfs/patches/100-lzma.patch b/toolchain/squashfs/patches/100-lzma.patch
index 85aa21fb9..85aa21fb9 100644
--- a/target/linux/image/squashfs/patches/100-lzma.patch
+++ b/toolchain/squashfs/patches/100-lzma.patch