X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/418adb8b4e823526e036796c855192451477ab46..6b3c1f56d16aa225b7ee2d96f24e74f1b9369954:/package/base-files/Makefile diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 1433d3422..3e83c01d9 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2007 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=base-files -PKG_RELEASE:=10 +PKG_RELEASE:=12 PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ @@ -130,21 +130,16 @@ define Package/base-files$(TARGET)/install if [ -d $(GENERIC_PLATFORM_DIR)/base-files/. ]; then \ $(CP) $(GENERIC_PLATFORM_DIR)/base-files/* $(1)/; \ fi - if [ -d $(PLATFORM_DIR)/base-files/default/. ]; then \ - $(CP) $(PLATFORM_DIR)/base-files/default/* $(1)/; \ + if [ -d $(PLATFORM_DIR)/base-files/. ]; then \ + $(CP) $(PLATFORM_DIR)/base-files/* $(1)/; \ fi $(if $(filter-out $(PLATFORM_DIR),$(PLATFORM_SUBDIR)), \ - if [ -d $(PLATFORM_SUBDIR)/base-files/default/. ]; then \ - $(CP) $(PLATFORM_SUBDIR)/base-files/default/* $(1)/; \ + if [ -d $(PLATFORM_SUBDIR)/base-files/. ]; then \ + $(CP) $(PLATFORM_SUBDIR)/base-files/* $(1)/; \ fi \ ) - if [ "$(PROFILE)" != "Default" ]; then \ - if [ -d $(PLATFORM_DIR)/base-files/profile-$(PROFILE)/. ]; then \ - $(CP) $(PLATFORM_DIR)/base-files/profile-$(PROFILE)/* $(1)/; \ - fi; \ - fi $(SED) 's,$$$$R,r$(REV),g' $(1)/etc/banner - $(SED) 's,$$$$S,$(BOARD)-$(KERNEL),g' -e 's,$$$$A,$(ARCH),g' $(1)/etc/ipkg.conf + $(SED) 's,$$$$S,$(BOARD),g' -e 's,$$$$A,$(ARCH),g' $(1)/etc/ipkg.conf mkdir -p $(1)/dev mkdir -p $(1)/etc/crontabs mkdir -p $(1)/jffs @@ -156,6 +151,7 @@ define Package/base-files$(TARGET)/install mkdir -p $(1)/usr/bin mkdir -p $(1)/sys mkdir -p $(1)/www + mkdir -p $(1)/root ln -sf /proc/mounts $(1)/etc/mtab rm -f $(1)/var ln -sf /tmp $(1)/var @@ -201,14 +197,6 @@ define Package/uclibc/install done endef -define Package/InstallDev - $(INSTALL_DIR) $(STAGING_DIR)/lib - for file in ld-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \ - $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(STAGING_DIR)/lib/; \ - $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(UCLIBC_VERSION).so $(STAGING_DIR)/lib/; \ - done -endef - define Package/ldd/install $(INSTALL_DIR) $(1)/bin/ $(CP) $(TOOLCHAIN_DIR)/target-utils/ldd $(1)/bin/