packages: use $(LN) macro, make symlinks relative

[openwrt/staging/wigyori.git] / package / base-files / Makefile

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index a6990848082abe9a3e6fe168c4249a98d992c8e4..d0d93e5ed6d0788fd1433e90cb9df2b9b631bb6b 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -7,14 +7,15 @@
 #
 
 include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/version.mk
 include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/version.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=154
+PKG_RELEASE:=157
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host
+PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -35,12 +36,16 @@ define Package/base-files
 endef
 
 define Package/base-files/conffiles
+/etc/config/network
+/etc/config/system
 /etc/hosts
 /etc/inittab
 /etc/group
 /etc/passwd
 /etc/shadow
 /etc/profile
+/etc/protocols
+/etc/services
 /etc/shells
 /etc/sysctl.conf
 /etc/rc.local
@@ -110,8 +115,11 @@ define Package/base-files/install
 
        $(VERSION_SED) \
                $(1)/etc/banner \
-               $(1)/etc/openwrt_version \
-               $(1)/etc/openwrt_release
+               $(1)/etc/openwrt_version
+
+       $(VERSION_SED_SCRIPT) \
+               $(1)/etc/openwrt_release \
+               $(1)/etc/device_info
 
        mkdir -p $(1)/CONTROL
        mkdir -p $(1)/dev
@@ -119,21 +127,21 @@ define Package/base-files/install
        mkdir -p $(1)/etc/rc.d
        mkdir -p $(1)/overlay
        mkdir -p $(1)/lib/firmware
-       $(if $(LIB_SUFFIX),-ln -s lib $(1)/lib$(LIB_SUFFIX))
+       $(if $(LIB_SUFFIX),-$(LN) lib $(1)/lib$(LIB_SUFFIX))
        mkdir -p $(1)/mnt
        mkdir -p $(1)/proc
        mkdir -p $(1)/tmp
        mkdir -p $(1)/usr/lib
-       $(if $(LIB_SUFFIX),-ln -s lib $(1)/usr/lib$(LIB_SUFFIX))
+       $(if $(LIB_SUFFIX),-$(LN) lib $(1)/usr/lib$(LIB_SUFFIX))
        mkdir -p $(1)/usr/bin
        mkdir -p $(1)/sys
        mkdir -p $(1)/www
        mkdir -p $(1)/root
-       ln -sf /proc/mounts $(1)/etc/mtab
+       $(LN) /proc/mounts $(1)/etc/mtab
        rm -f $(1)/var
-       ln -sf /tmp $(1)/var
+       $(LN) /tmp $(1)/var
        mkdir -p $(1)/etc
-       ln -sf /tmp/resolv.conf /tmp/fstab /tmp/TZ $(1)/etc/
+       $(LN) /tmp/resolv.conf /tmp/fstab /tmp/TZ $(1)/etc/
 
        chmod 0600 $(1)/etc/shadow
        chmod 1777 $(1)/tmp