fix typo in firstboot - /etc/config/* is now a file instead of a symlink

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

diff --git a/openwrt/package/base-files/Makefile b/openwrt/package/base-files/Makefile
index 9582627..8517dcc 100644 (file)
--- a/openwrt/package/base-files/Makefile
+++ b/openwrt/package/base-files/Makefile
@@ -52,32 +52,36 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_BASE):
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_BASE) ipkg/$(PKG_NAME).control $(PKG_RELEASE) $(ARCH)
 
 $(IPKG_BASE):
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_BASE) ipkg/$(PKG_NAME).control $(PKG_RELEASE) $(ARCH)

-       cp -a ./default/* $(IDIR_BASE)
+       $(CP) ./default/* $(IDIR_BASE)

        $(SED) 's,$$R,r$(REV),g' $(IDIR_BASE)/etc/banner
        $(SED) 's,$$S,$(BOARD)-$(KERNEL),g' $(IDIR_BASE)/etc/ipkg.conf
        $(SED) 's,$$R,r$(REV),g' $(IDIR_BASE)/etc/banner
        $(SED) 's,$$S,$(BOARD)-$(KERNEL),g' $(IDIR_BASE)/etc/ipkg.conf

-       mkdir -p $(IDIR_BASE)/jffs

        mkdir -p $(IDIR_BASE)/dev
        mkdir -p $(IDIR_BASE)/dev

+       mkdir -p $(IDIR_BASE)/etc/crontabs
+       mkdir -p $(IDIR_BASE)/jffs
+       mkdir -p $(IDIR_BASE)/lib
+       mkdir -p $(IDIR_BASE)/mnt

        mkdir -p $(IDIR_BASE)/proc
        mkdir -p $(IDIR_BASE)/tmp
        mkdir -p $(IDIR_BASE)/proc
        mkdir -p $(IDIR_BASE)/tmp

-       mkdir -p $(IDIR_BASE)/lib

        mkdir -p $(IDIR_BASE)/usr/lib
        mkdir -p $(IDIR_BASE)/usr/bin
        mkdir -p $(IDIR_BASE)/usr/lib
        mkdir -p $(IDIR_BASE)/usr/bin

+       mkdir -p $(IDIR_BASE)/sys
+       mkdir -p $(IDIR_BASE)/www

        ln -sf /tmp/resolv.conf $(IDIR_BASE)/etc/resolv.conf
        ln -sf /tmp/resolv.conf $(IDIR_BASE)/etc/resolv.conf

-       rm -rf $(IDIR_BASE)/var
+       ln -sf /proc/mounts $(IDIR_BASE)/etc/mtab
+       rm -f $(IDIR_BASE)/var

        ln -sf /tmp $(IDIR_BASE)/var
        -find $(IDIR_BASE) -type d -name CVS | xargs rm -rf
        -find $(IDIR_BASE) -type d -name .svn | xargs rm -rf
        -find $(IDIR_BASE) -name '.#*' | xargs rm -f
        mkdir -p $(IDIR_BASE)/etc
        ln -sf /tmp $(IDIR_BASE)/var
        -find $(IDIR_BASE) -type d -name CVS | xargs rm -rf
        -find $(IDIR_BASE) -type d -name .svn | xargs rm -rf
        -find $(IDIR_BASE) -name '.#*' | xargs rm -f
        mkdir -p $(IDIR_BASE)/etc

-       -grep \^BR2_SYSCONF $(TOPDIR)/.config > $(IDIR_BASE)/etc/sysconf

        $(IPKG_BUILD) $(IDIR_BASE) $(PACKAGE_DIR)
 
 $(IPKG_UCLIBC):
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_UCLIBC) ipkg/uclibc.control $(UCLIBC_VERSION)-$(PKG_RELEASE) $(ARCH)
        mkdir -p $(IDIR_UCLIBC)/lib
        for file in ld-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \
        $(IPKG_BUILD) $(IDIR_BASE) $(PACKAGE_DIR)
 
 $(IPKG_UCLIBC):
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_UCLIBC) ipkg/uclibc.control $(UCLIBC_VERSION)-$(PKG_RELEASE) $(ARCH)
        mkdir -p $(IDIR_UCLIBC)/lib
        for file in ld-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \

-               cp -fpR $(STAGING_DIR)/lib/$$file.so.* $(IDIR_UCLIBC)/lib/; \
-               cp -fpR $(STAGING_DIR)/lib/$$file-$(UCLIBC_VERSION).so $(IDIR_UCLIBC)/lib/; \
+               $(CP) $(STAGING_DIR)/lib/$$file.so.* $(IDIR_UCLIBC)/lib/; \
+               $(CP) $(STAGING_DIR)/lib/$$file-$(UCLIBC_VERSION).so $(IDIR_UCLIBC)/lib/; \

        done
        -$(STRIP) $(IDIR_UCLIBC)/lib/*
        $(IPKG_BUILD) $(IDIR_UCLIBC) $(PACKAGE_DIR)
        done
        -$(STRIP) $(IDIR_UCLIBC)/lib/*
        $(IPKG_BUILD) $(IDIR_UCLIBC) $(PACKAGE_DIR)


@@ -85,7 +89,7 @@ $(IPKG_UCLIBC):
 $(IPKG_LIBGCC):
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBGCC) ipkg/libgcc.control $(LIBGCC_VERSION)-$(PKG_RELEASE) $(ARCH)
        mkdir -p $(IDIR_LIBGCC)/lib
 $(IPKG_LIBGCC):
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBGCC) ipkg/libgcc.control $(LIBGCC_VERSION)-$(PKG_RELEASE) $(ARCH)
        mkdir -p $(IDIR_LIBGCC)/lib

-       cp -fpR $(STAGING_DIR)/lib/libgcc_s.so.* $(IDIR_LIBGCC)/lib/
+       $(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(IDIR_LIBGCC)/lib/

        -$(STRIP) $(IDIR_LIBGCC)/lib/*
        $(IPKG_BUILD) $(IDIR_LIBGCC) $(PACKAGE_DIR)
 
        -$(STRIP) $(IDIR_LIBGCC)/lib/*
        $(IPKG_BUILD) $(IDIR_LIBGCC) $(PACKAGE_DIR)