X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c4b73fa154ce47702ee9b3bbe621d8f079eb7fa5..e1c2a7ffcafd82259dfe90ecce3eeb1f1b63d1e4:/package/base-files/Makefile
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index dfbfd60b5..231647e98 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,19 +10,21 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=base-files
-PKG_RELEASE:=9
+PKG_RELEASE:=13
PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
-REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
-ifeq ($(REV),)
- REV:=0
-endif
include $(INCLUDE_DIR)/package.mk
ifneq ($(DUMP),1)
- TARGET:=-$(BOARD)-$(KERNEL)
+ TARGET:=-$(BOARD)
+ ifneq ($(wildcard $(PLATFORM_DIR)/base-files-$(PROFILE) $(PLATFORM_SUBDIR)/base-files-$(PROFILE)),)
+ TARGET:=$(TARGET)-$(PROFILE)
+ endif
LIBGCC_VERSION:=$(GCC_VERSION)
+ ifeq ($(ARCH),x86_64)
+ LIB_SUFFIX:=64
+ endif
else
UCLIBC_VERSION:=<UCLIBC_VERSION>
LIBGCC_VERSION:=<LIBGCC_VERSION>
@@ -35,7 +37,7 @@ define Package/base-files$(TARGET)
CATEGORY:=Base system
TITLE:=Base filesystem for OpenWrt
URL:=http://openwrt.org/
- VERSION:=$(PKG_RELEASE)-$(REV)
+ VERSION:=$(PKG_RELEASE)-$(REVISION)
$(call Config,network.lan.proto,string,static,LAN Protocol)
$(call Config,network.lan.ipaddr,ip,192.168.1.1,LAN IP Address)
$(call Config,network.lan.netmask,netmask,255.255.255.0,LAN Network Mask)
@@ -71,11 +73,12 @@ endef
define Package/libgcc
$(call Package/gcc/Default)
TITLE:=GCC support library
- DEPENDS:=@!TARGET_AVR32 @!NATIVE_TOOLCHAIN
+ DEPENDS:=@!TARGET_avr32 @!NATIVE_TOOLCHAIN
endef
define Package/libssp
$(call Package/gcc/Default)
+ DEPENDS:=@SSP_SUPPORT
TITLE:=GCC support library
endef
@@ -104,6 +107,16 @@ $(call Package/uclibc/Default)
TITLE:=C library embedded systems
endef
+define Package/ldd
+$(call Package/uclibc/Default)
+ TITLE:=LDD trace utility
+endef
+
+define Package/ldconfig
+$(call Package/uclibc/Default)
+ TITLE:=Shared library path configuration
+endef
+
define Build/Prepare
mkdir -p $(PKG_BUILD_DIR)
endef
@@ -120,16 +133,23 @@ 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 [ "$(PROFILE)" != "Default" ]; then \
- if [ -d $(PLATFORM_DIR)/base-files/profile-$(PROFILE)/. ]; then \
- $(CP) $(PLATFORM_DIR)/base-files/profile-$(PROFILE)/* $(1)/; \
- fi; \
+ if [ -d $(PLATFORM_DIR)/base-files-$(PROFILE)/. ]; then \
+ $(CP) $(PLATFORM_DIR)/base-files-$(PROFILE)/* $(1)/; \
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
+ $(if $(filter-out $(PLATFORM_DIR),$(PLATFORM_SUBDIR)), \
+ if [ -d $(PLATFORM_SUBDIR)/base-files/. ]; then \
+ $(CP) $(PLATFORM_SUBDIR)/base-files/* $(1)/; \
+ fi; \
+ if [ -d $(PLATFORM_SUBDIR)/base-files-$(PROFILE)/. ]; then \
+ $(CP) $(PLATFORM_SUBDIR)/base-files-$(PROFILE)/* $(1)/; \
+ fi \
+ )
+ $(if $(CONFIG_BUSYBOX_CONFIG_FEATURE_SHADOWPASSWDS),cp $(1)/etc/passwd $(1)/etc/shadow)
+ $(SED) 's,$$$$R,$(REVISION),g' $(1)/etc/banner
+ $(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
@@ -141,11 +161,12 @@ 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
mkdir -p $(1)/etc
- ln -sf /tmp/resolv.conf $(1)/etc/resolv.conf
+ ln -sf /tmp/resolv.conf /tmp/fstab /tmp/TZ $(1)/etc/
$(call Package/base-files/install-target,$(1))
for conffile in $(1)/etc/config/*; do \
if [ -f "$$$$conffile" ]; then \
@@ -157,19 +178,19 @@ endef
define Package/libgcc/install
$(INSTALL_DIR) $(1)/lib
- $(CP) $(TOOLCHAIN_DIR)/lib/libgcc_s.so.* $(1)/lib/
+ $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libgcc_s.so.* $(1)/lib/
endef
ifeq ($(word 1,$(subst ., ,$(LIBGCC_VERSION))),4)
define Package/libssp/install
$(INSTALL_DIR) $(1)/lib
- $(CP) $(TOOLCHAIN_DIR)/lib/libssp.so.* $(1)/lib/
+ $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libssp.so.* $(1)/lib/
endef
endif
define Package/libstdcpp/install
$(INSTALL_DIR) $(1)/lib
- $(CP) $(TOOLCHAIN_DIR)/lib/libstdc++.so.* $(1)/lib/
+ $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libstdc++.so.* $(1)/lib/
endef
define Package/libpthread/install
@@ -180,7 +201,7 @@ endef
define Package/uclibc/install
$(INSTALL_DIR) $(1)/lib
- for file in ld-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \
+ for file in ld$(LIB_SUFFIX)-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \
$(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(1)/lib/; \
$(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(UCLIBC_VERSION).so $(1)/lib/; \
done
@@ -188,12 +209,12 @@ endef
define Package/ldd/install
$(INSTALL_DIR) $(1)/bin/
- $(CP) $(TOOLCHAIN_DIR)/utils/ldd $(1)/bin/
+ $(CP) $(TOOLCHAIN_DIR)/target-utils/ldd $(1)/bin/
endef
define Package/ldconfig/install
$(INSTALL_DIR) $(1)/bin/
- $(CP) $(TOOLCHAIN_DIR)/utils/ldconfig $(1)/bin/
+ $(CP) $(TOOLCHAIN_DIR)/target-utils/ldconfig $(1)/bin/
endef
ifneq ($(DUMP),1)
@@ -206,3 +227,5 @@ $(eval $(call BuildPackage,libssp))
$(eval $(call BuildPackage,libstdcpp))
$(eval $(call BuildPackage,libpthread))
$(eval $(call BuildPackage,uclibc))
+$(eval $(call BuildPackage,ldd))
+$(eval $(call BuildPackage,ldconfig))