diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-11-22 23:27:29 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-11-22 23:27:29 +0000 |
commit | 356535ffd7bc1343ce6bc2fc367f788cc2c1bd24 (patch) | |
tree | dc8d648372e516e754590075b43f0dba98df8546 | |
parent | 6f447d09dfa4c4ee2321f327c5b62e79db3f9173 (diff) |
move platform specific base-files into target/linux/<targetname>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5621 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r-- | include/kernel.mk | 1 | ||||
-rw-r--r-- | package/base-files/Makefile | 68 | ||||
-rw-r--r-- | target/linux/ar7-2.4/base-files.mk | 11 | ||||
-rwxr-xr-x | target/linux/ar7-2.4/base-files/bin/firstboot (renamed from package/base-files/ar7/bin/firstboot) | 0 | ||||
-rw-r--r-- | target/linux/ar7-2.4/base-files/etc/config/network (renamed from package/base-files/ar7/etc/config/network) | 0 | ||||
-rwxr-xr-x | target/linux/ar7-2.4/base-files/etc/init.d/adam2 (renamed from package/base-files/ar7/etc/init.d/adam2) | 0 | ||||
-rwxr-xr-x | target/linux/ar7-2.4/base-files/etc/preinit (renamed from package/base-files/ar7/etc/preinit) | 0 | ||||
-rwxr-xr-x | target/linux/ar7-2.4/base-files/sbin/mount_root (renamed from package/base-files/ar7/sbin/mount_root) | 0 | ||||
-rw-r--r-- | target/linux/ar7-2.4/src/adam2patcher.c (renamed from package/base-files/src/adam2patcher.c) | 0 | ||||
-rw-r--r-- | target/linux/aruba-2.6/base-files/etc/config/network (renamed from package/base-files/aruba/etc/config/network) | 0 | ||||
-rw-r--r-- | target/linux/au1000-2.6/base-files/etc/config/network (renamed from package/base-files/au1000/etc/config/network) | 0 | ||||
-rwxr-xr-x | target/linux/au1000-2.6/base-files/sbin/mount_root (renamed from package/base-files/au1000/sbin/mount_root) | 0 | ||||
-rw-r--r-- | target/linux/brcm-2.4/base-files.mk | 12 | ||||
-rwxr-xr-x | target/linux/brcm-2.4/base-files/bin/firstboot (renamed from package/base-files/brcm/bin/firstboot) | 0 | ||||
-rw-r--r-- | target/linux/brcm-2.4/base-files/etc/diag.sh (renamed from package/base-files/brcm/etc/diag.sh) | 0 | ||||
-rwxr-xr-x | target/linux/brcm-2.4/base-files/etc/init.d/done (renamed from package/base-files/brcm/etc/init.d/done) | 0 | ||||
-rwxr-xr-x | target/linux/brcm-2.4/base-files/etc/init.d/netconfig (renamed from package/base-files/brcm/etc/init.d/netconfig) | 0 | ||||
-rwxr-xr-x | target/linux/brcm-2.4/base-files/etc/preinit (renamed from package/base-files/brcm/etc/preinit) | 0 | ||||
-rwxr-xr-x | target/linux/brcm-2.4/base-files/sbin/hotplug.failsafe (renamed from package/base-files/brcm/sbin/hotplug.failsafe) | 0 | ||||
-rwxr-xr-x | target/linux/brcm-2.4/base-files/sbin/mount_root (renamed from package/base-files/brcm/sbin/mount_root) | 0 | ||||
-rw-r--r-- | target/linux/brcm-2.4/src/jffs2root.c (renamed from package/base-files/src/jffs2root.c) | 0 | ||||
-rw-r--r-- | target/linux/brcm-2.4/src/mtd.h (renamed from package/base-files/src/mtd.h) | 0 | ||||
l--------- | target/linux/brcm-2.6/base-files | 1 | ||||
l--------- | target/linux/brcm-2.6/base-files.mk | 1 | ||||
-rw-r--r-- | target/linux/ixp4xx-2.6/base-files/etc/config/network (renamed from package/base-files/xscale/etc/config/network) | 0 | ||||
-rw-r--r-- | target/linux/rb532-2.6/base-files/etc/config/network (renamed from package/base-files/rb532/etc/config/network) | 0 | ||||
-rwxr-xr-x | target/linux/rb532-2.6/base-files/sbin/cf2nand (renamed from package/base-files/rb532/sbin/cf2nand) | 0 | ||||
-rw-r--r-- | target/linux/sibyte-2.6/base-files/etc/config/network (renamed from package/base-files/sibyte-2.6/etc/config/network) | 0 | ||||
-rw-r--r-- | target/linux/sibyte-2.6/base-files/etc/inittab (renamed from package/base-files/sibyte-2.6/etc/inittab) | 0 | ||||
-rw-r--r-- | target/linux/x86-2.6/base-files/etc/config/network (renamed from package/base-files/x86/etc/config/network) | 0 |
30 files changed, 41 insertions, 53 deletions
diff --git a/include/kernel.mk b/include/kernel.mk index bc07411b6..b8af46c2b 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -26,6 +26,7 @@ else KERNEL_CROSS:=$(TARGET_CROSS) endif + PLATFORM_DIR := $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL) KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) LINUX_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 5af1414d4..04a63b749 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -42,34 +42,6 @@ define Package/base-files$(TARGET) VERSION:=$(PKG_RELEASE)-$(REV) endef -define -ar7-2.4/conffiles -/etc/config/network -endef - -define -aruba-2.6/conffiles -/etc/config/network -endef - -define -au1000-2.6/conffiles -/etc/config/network -endef - -define -rb532-2.6/conffiles -/etc/config/network -endef - -define -sibyte-2.6/conffiles -/etc/config/network -endef - -define -x86-2.6/conffiles -/etc/config/network -endef - -define -xscale-2.6/conffiles -/etc/config/network -endef - define Package/base-files$(TARGET)/conffiles /etc/banner /etc/hosts @@ -114,37 +86,17 @@ define Build/Prepare mkdir -p $(PKG_BUILD_DIR) endef -define Build/Compile/ar7 - $(TARGET_CC) -o $(PKG_BUILD_DIR)/adam2patcher src/adam2patcher.c -endef - -define Build/Compile/brcm - $(TARGET_CC) -I src -o $(PKG_BUILD_DIR)/jffs2root src/jffs2root.c +define Build/Compile/Default endef define Build/Compile - $(call Build/Compile/$(BOARD)) -endef - - -define Package/base-files$(TARGET)/install-ar7 - mkdir -p $(1)/sbin - $(CP) $(PKG_BUILD_DIR)/adam2patcher $(1)/sbin -endef - -define Package/base-files$(TARGET)/install-brcm - rm -f $(1)/etc/config/network - mkdir -p $(1)/sbin - $(CP) $(PKG_BUILD_DIR)/jffs2root $(1)/sbin + $(call Build/Compile/Default) endef define Package/base-files$(TARGET)/install $(CP) ./default/* $(1)/ - if [ -d $(BOARD) ]; then \ - $(CP) $(BOARD)/* $(1)/; \ - fi - if [ -d $(BOARD)-$(KERNEL) ]; then \ - $(CP) $(BOARD)-$(KERNEL)/* $(1)/; \ + if [ -d $(PLATFORM_DIR)/base-files/. ]; then \ + $(CP) $(PLATFORM_DIR)/base-files/* $(1)/; \ fi $(SED) 's,$$$$R,r$(REV),g' $(1)/etc/banner $(SED) 's,$$$$S,$(BOARD)-$(KERNEL),g' $(1)/etc/ipkg.conf @@ -163,7 +115,13 @@ define Package/base-files$(TARGET)/install rm -f $(1)/var ln -sf /tmp $(1)/var mkdir -p $(1)/etc -$(call Package/base-files$(TARGET)/install-$(BOARD),$(1)) + $(call Package/base-files/install-target,$(1)) + for conffile in $(1)/etc/config/*; do \ + if [ -f "$$$$conffile" ]; then \ + grep "$$$$conffile" $(1)/CONTROL/conffiles || \ + echo "$$$${conffile##$(1)}" >> $(1)/CONTROL/conffiles; \ + fi \ + done endef define Package/libgcc/install @@ -185,6 +143,10 @@ define Package/uclibc/install done endef +ifneq ($(DUMP),1) + -include $(PLATFORM_DIR)/base-files.mk +endif + $(eval $(call BuildPackage,base-files$(TARGET))) $(eval $(call BuildPackage,libgcc)) $(eval $(call BuildPackage,libpthread)) diff --git a/target/linux/ar7-2.4/base-files.mk b/target/linux/ar7-2.4/base-files.mk new file mode 100644 index 000000000..f21a604b8 --- /dev/null +++ b/target/linux/ar7-2.4/base-files.mk @@ -0,0 +1,11 @@ +define Build/Compile + $(call Build/Compile/Default) + $(TARGET_CC) -o $(PKG_BUILD_DIR)/adam2patcher $(PLATFORM_DIR)/src/adam2patcher.c +endef + +define Package/base-files/install-target + mkdir -p $(1)/sbin + $(CP) $(PKG_BUILD_DIR)/adam2patcher $(1)/sbin +endef + + diff --git a/package/base-files/ar7/bin/firstboot b/target/linux/ar7-2.4/base-files/bin/firstboot index 774bbc754..774bbc754 100755 --- a/package/base-files/ar7/bin/firstboot +++ b/target/linux/ar7-2.4/base-files/bin/firstboot diff --git a/package/base-files/ar7/etc/config/network b/target/linux/ar7-2.4/base-files/etc/config/network index 911134bb0..911134bb0 100644 --- a/package/base-files/ar7/etc/config/network +++ b/target/linux/ar7-2.4/base-files/etc/config/network diff --git a/package/base-files/ar7/etc/init.d/adam2 b/target/linux/ar7-2.4/base-files/etc/init.d/adam2 index 425bc15d6..425bc15d6 100755 --- a/package/base-files/ar7/etc/init.d/adam2 +++ b/target/linux/ar7-2.4/base-files/etc/init.d/adam2 diff --git a/package/base-files/ar7/etc/preinit b/target/linux/ar7-2.4/base-files/etc/preinit index 5b676ca3a..5b676ca3a 100755 --- a/package/base-files/ar7/etc/preinit +++ b/target/linux/ar7-2.4/base-files/etc/preinit diff --git a/package/base-files/ar7/sbin/mount_root b/target/linux/ar7-2.4/base-files/sbin/mount_root index 6b90bdc9c..6b90bdc9c 100755 --- a/package/base-files/ar7/sbin/mount_root +++ b/target/linux/ar7-2.4/base-files/sbin/mount_root diff --git a/package/base-files/src/adam2patcher.c b/target/linux/ar7-2.4/src/adam2patcher.c index 25a78074a..25a78074a 100644 --- a/package/base-files/src/adam2patcher.c +++ b/target/linux/ar7-2.4/src/adam2patcher.c diff --git a/package/base-files/aruba/etc/config/network b/target/linux/aruba-2.6/base-files/etc/config/network index 1d9b55b2d..1d9b55b2d 100644 --- a/package/base-files/aruba/etc/config/network +++ b/target/linux/aruba-2.6/base-files/etc/config/network diff --git a/package/base-files/au1000/etc/config/network b/target/linux/au1000-2.6/base-files/etc/config/network index 9b65652f0..9b65652f0 100644 --- a/package/base-files/au1000/etc/config/network +++ b/target/linux/au1000-2.6/base-files/etc/config/network diff --git a/package/base-files/au1000/sbin/mount_root b/target/linux/au1000-2.6/base-files/sbin/mount_root index 718394ca4..718394ca4 100755 --- a/package/base-files/au1000/sbin/mount_root +++ b/target/linux/au1000-2.6/base-files/sbin/mount_root diff --git a/target/linux/brcm-2.4/base-files.mk b/target/linux/brcm-2.4/base-files.mk new file mode 100644 index 000000000..9a2e365b6 --- /dev/null +++ b/target/linux/brcm-2.4/base-files.mk @@ -0,0 +1,12 @@ +define Build/Compile + $(call Build/Compile/Default) + $(TARGET_CC) -I $(PLATFORM_DIR)/src -o $(PKG_BUILD_DIR)/jffs2root $(PLATFORM_DIR)/src/jffs2root.c +endef + +define Package/base-files/install-target + rm -f $(1)/etc/config/network + mkdir -p $(1)/sbin + $(CP) $(PKG_BUILD_DIR)/jffs2root $(1)/sbin +endef + + diff --git a/package/base-files/brcm/bin/firstboot b/target/linux/brcm-2.4/base-files/bin/firstboot index c3d9a64b8..c3d9a64b8 100755 --- a/package/base-files/brcm/bin/firstboot +++ b/target/linux/brcm-2.4/base-files/bin/firstboot diff --git a/package/base-files/brcm/etc/diag.sh b/target/linux/brcm-2.4/base-files/etc/diag.sh index 3b08554c6..3b08554c6 100644 --- a/package/base-files/brcm/etc/diag.sh +++ b/target/linux/brcm-2.4/base-files/etc/diag.sh diff --git a/package/base-files/brcm/etc/init.d/done b/target/linux/brcm-2.4/base-files/etc/init.d/done index 0640b6193..0640b6193 100755 --- a/package/base-files/brcm/etc/init.d/done +++ b/target/linux/brcm-2.4/base-files/etc/init.d/done diff --git a/package/base-files/brcm/etc/init.d/netconfig b/target/linux/brcm-2.4/base-files/etc/init.d/netconfig index fe39f5051..fe39f5051 100755 --- a/package/base-files/brcm/etc/init.d/netconfig +++ b/target/linux/brcm-2.4/base-files/etc/init.d/netconfig diff --git a/package/base-files/brcm/etc/preinit b/target/linux/brcm-2.4/base-files/etc/preinit index 30aed3551..30aed3551 100755 --- a/package/base-files/brcm/etc/preinit +++ b/target/linux/brcm-2.4/base-files/etc/preinit diff --git a/package/base-files/brcm/sbin/hotplug.failsafe b/target/linux/brcm-2.4/base-files/sbin/hotplug.failsafe index 0544339de..0544339de 100755 --- a/package/base-files/brcm/sbin/hotplug.failsafe +++ b/target/linux/brcm-2.4/base-files/sbin/hotplug.failsafe diff --git a/package/base-files/brcm/sbin/mount_root b/target/linux/brcm-2.4/base-files/sbin/mount_root index ffa6072c6..ffa6072c6 100755 --- a/package/base-files/brcm/sbin/mount_root +++ b/target/linux/brcm-2.4/base-files/sbin/mount_root diff --git a/package/base-files/src/jffs2root.c b/target/linux/brcm-2.4/src/jffs2root.c index 3562eb462..3562eb462 100644 --- a/package/base-files/src/jffs2root.c +++ b/target/linux/brcm-2.4/src/jffs2root.c diff --git a/package/base-files/src/mtd.h b/target/linux/brcm-2.4/src/mtd.h index 8b83afd57..8b83afd57 100644 --- a/package/base-files/src/mtd.h +++ b/target/linux/brcm-2.4/src/mtd.h diff --git a/target/linux/brcm-2.6/base-files b/target/linux/brcm-2.6/base-files new file mode 120000 index 000000000..aa485f25b --- /dev/null +++ b/target/linux/brcm-2.6/base-files @@ -0,0 +1 @@ +../brcm-2.4/base-files
\ No newline at end of file diff --git a/target/linux/brcm-2.6/base-files.mk b/target/linux/brcm-2.6/base-files.mk new file mode 120000 index 000000000..13c8c34bf --- /dev/null +++ b/target/linux/brcm-2.6/base-files.mk @@ -0,0 +1 @@ +../brcm-2.4/base-files.mk
\ No newline at end of file diff --git a/package/base-files/xscale/etc/config/network b/target/linux/ixp4xx-2.6/base-files/etc/config/network index 1d9b55b2d..1d9b55b2d 100644 --- a/package/base-files/xscale/etc/config/network +++ b/target/linux/ixp4xx-2.6/base-files/etc/config/network diff --git a/package/base-files/rb532/etc/config/network b/target/linux/rb532-2.6/base-files/etc/config/network index 827969057..827969057 100644 --- a/package/base-files/rb532/etc/config/network +++ b/target/linux/rb532-2.6/base-files/etc/config/network diff --git a/package/base-files/rb532/sbin/cf2nand b/target/linux/rb532-2.6/base-files/sbin/cf2nand index f8576beaa..f8576beaa 100755 --- a/package/base-files/rb532/sbin/cf2nand +++ b/target/linux/rb532-2.6/base-files/sbin/cf2nand diff --git a/package/base-files/sibyte-2.6/etc/config/network b/target/linux/sibyte-2.6/base-files/etc/config/network index 9b65652f0..9b65652f0 100644 --- a/package/base-files/sibyte-2.6/etc/config/network +++ b/target/linux/sibyte-2.6/base-files/etc/config/network diff --git a/package/base-files/sibyte-2.6/etc/inittab b/target/linux/sibyte-2.6/base-files/etc/inittab index a6f4e17f0..a6f4e17f0 100644 --- a/package/base-files/sibyte-2.6/etc/inittab +++ b/target/linux/sibyte-2.6/base-files/etc/inittab diff --git a/package/base-files/x86/etc/config/network b/target/linux/x86-2.6/base-files/etc/config/network index 68d8e4240..68d8e4240 100644 --- a/package/base-files/x86/etc/config/network +++ b/target/linux/x86-2.6/base-files/etc/config/network |