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

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 536857657..5e51b7e65 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -1,10 +1,11 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
+include $(TOPDIR)/package/kernel.mk
 
 PKG_NAME:=base-files
 PKG_RELEASE:=8
-PKG_BUILD_DIR:=$(BUILD_DIR)/base-files
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/base-files
 
 REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
 ifeq ($(REV),)
@@ -14,15 +15,12 @@ endif
 include $(TOPDIR)/package/rules.mk
 
 ifneq ($(DUMP),1)
-include $(BUILD_DIR)/kernel.mk
-include $(TOPDIR)/target/linux/rules.mk
 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
+CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files)
 
 define Package/base-files$(TARGET)
  SECTION:=base
@@ -30,12 +28,13 @@ define Package/base-files$(TARGET)
  DEFAULT:=y
  TITLE:=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)
@@ -48,7 +47,6 @@ define Package/uclibc
  DESCRIPTION:=C library for embedded systems
 endef
 
-
 define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)
 endef
@@ -78,7 +76,7 @@ endef
 
 define Package/base-files$(TARGET)/install
 $(call Package/base-files$(TARGET)/install-$(BOARD),$(1))
-	$(CP) ./default/* $(1)
+	$(CP) ./default/* $(1)/
 	if [ -d $(BOARD)-$(KERNEL) ]; then \
 		$(CP) $(BOARD)-$(KERNEL)/* $(1)/; \
 	fi
@@ -99,9 +97,6 @@ $(call Package/base-files$(TARGET)/install-$(BOARD),$(1))
 	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