X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/3c17bb247ff2d9260af8dccad333b52b70d299e7..46a635746c320950c7edabc1d1a0c12960c0c0e7:/package/base-files/Makefile

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 263794969..5e51b7e65 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -1,15 +1,11 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
+include $(TOPDIR)/package/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=7
-PKG_BUILD_DIR:=$(BUILD_DIR)/base-files
-
-BOARD:=$(shell LANG=C grep ^CONFIG_LINUX_2_._ $(TOPDIR)/.config|sed -e "s/=y//" \
-	-e "s/.*_//"| tr "[:upper:]" "[:lower:]")
-KERNEL:=$(shell LANG=C grep ^CONFIG_LINUX_2_._ $(TOPDIR)/.config|sed -e "s/=y//" \
-	-e "s/CONFIG_LINUX_//" -e "s/_BRCM//" -e "s/_/./"| tr "[:upper:]" "[:lower:]")
+PKG_RELEASE:=8
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/base-files
 
 REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
 ifeq ($(REV),)
@@ -18,44 +14,72 @@ endif
 
 include $(TOPDIR)/package/rules.mk
 
-#FIXME: use the version from ./toolchain/uclibc
-UCLIBC_VERSION:=0.9.28
-LIBGCC_VERSION:=$(CONFIG_GCC_VERSION)
+ifneq ($(DUMP),1)
+TARGET:=-$(BOARD)-$(KERNEL)
+UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version}
+LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version}
+endif
+
+CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files)
 
-define Package/base-files
+define Package/base-files$(TARGET)
  SECTION:=base
  CATEGORY:=Base system
  DEFAULT:=y
  TITLE:=OpenWrt system scripts
- DESCRIPTION:=OpenWrt system scripts
+ DESCRIPTION:=Base filesystem for OpenWrt
+ VERSION:=$(PKG_RELEASE)
 endef
 
 define Package/libgcc
  SECTION:=libs
  CATEGORY:=Libraries
- DEFAULT:=m, y if GCC_VERSION_4_0_2 || GCC_VERSION_4_0_3 || GCC_VERSION_4_1_0
+ DEFAULT:=y
  TITLE:=GCC support library
  VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
  DESCRIPTION:=$(TITLE)
 endef
 
 define Package/uclibc
- $(call Package/base-files)
+ $(call Package/base-files$(TARGET))
  VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
  TITLE:=C library
  DESCRIPTION:=C library for embedded systems
 endef
 
-
 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) -o $(PKG_BUILD_DIR)/jffs2root src/jffs2root.c
+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
+	mkdir -p $(1)/sbin
+	$(CP) $(PKG_BUILD_DIR)/jffs2root $(1)/sbin
 endef
 
-define Package/base-files/install
-	$(CP) ./default/* $(1)
+define Package/base-files$(TARGET)/install
+$(call Package/base-files$(TARGET)/install-$(BOARD),$(1))
+	$(CP) ./default/* $(1)/
+	if [ -d $(BOARD)-$(KERNEL) ]; then \
+		$(CP) $(BOARD)-$(KERNEL)/* $(1)/; \
+	fi
 	$(SED) 's,$$$$R,r$(REV),g' $(1)/etc/banner
 	$(SED) 's,$$$$S,$(BOARD)-$(KERNEL),g' $(1)/etc/ipkg.conf
 	mkdir -p $(1)/dev
@@ -73,9 +97,6 @@ define Package/base-files/install
 	ln -sf /proc/mounts $(1)/etc/mtab
 	rm -f $(1)/var
 	ln -sf /tmp $(1)/var
-	-find $(1) -type d -name CVS | xargs rm -rf
-	-find $(1) -type d -name .svn | xargs rm -rf
-	-find $(1) -name '.#*' | xargs rm -f
 	mkdir -p $(1)/etc
 endef
 
@@ -92,6 +113,6 @@ define Package/libgcc/install
 	$(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(1)/lib/
 endef
 
-$(eval $(call BuildPackage,base-files))
+$(eval $(call BuildPackage,base-files$(TARGET)))
 $(eval $(call BuildPackage,libgcc))
 $(eval $(call BuildPackage,uclibc))