diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2006-05-31 13:27:11 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2006-05-31 13:27:11 +0000 |
| commit | bab43e3269e2a1a2b7eb6aefe630b0aed735382f (patch) | |
| tree | bd9f125e3e8f05731d074da6d17fe275a8c16377 | |
| parent | 24c7f4cd0864361627e692df88f3a1c9e7ee2e79 (diff) | |
| download | master-187ad058-bab43e3269e2a1a2b7eb6aefe630b0aed735382f.tar.gz master-187ad058-bab43e3269e2a1a2b7eb6aefe630b0aed735382f.tar.bz2 master-187ad058-bab43e3269e2a1a2b7eb6aefe630b0aed735382f.zip | |
cleanup; change base-files build directory
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3858 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/base-files/Makefile | 22 | ||||
| -rw-r--r-- | package/rules.mk | 5 |
2 files changed, 13 insertions, 14 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 536857657f..485ebddc3b 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -2,6 +2,16 @@ include $(TOPDIR)/rules.mk +ifneq ($(DUMP),1) +include $(BUILD_DIR)/kernel.mk +include $(TOPDIR)/target/linux/rules.mk +TARGET:=-$(BOARD)-$(KERNEL) +BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) + +UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version} +LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version} +endif + PKG_NAME:=base-files PKG_RELEASE:=8 PKG_BUILD_DIR:=$(BUILD_DIR)/base-files @@ -13,15 +23,6 @@ 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 define Package/base-files$(TARGET) @@ -99,9 +100,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 diff --git a/package/rules.mk b/package/rules.mk index 50f03effae..26b41969d9 100644 --- a/package/rules.mk +++ b/package/rules.mk @@ -154,8 +154,9 @@ define BuildPackage $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built $(call Package/$(1)/install,$$(IDIR_$(1))) mkdir -p $(PACKAGE_DIR) - find $$(IDIR_$(1)) -name CVS | xargs rm -rf - find $$(IDIR_$(1)) -name .svn | xargs rm -rf + -find $$(IDIR_$(1)) -name CVS | xargs rm -rf + -find $$(IDIR_$(1)) -name .svn | xargs rm -rf + -find $$(IDIR_$(1)) -name '.#*' | xargs rm -f $(RSTRIP) $$(IDIR_$(1)) $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR) |