use /tmp/resolv.conf when using a static nameserver (#177)

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

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 16169fa..7601de2 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,6 +6,11 @@ PKG_NAME:=base-files
 PKG_RELEASE:=6
 PKG_BUILD_DIR:=$(BUILD_DIR)/base-files
 
 PKG_RELEASE:=6
 PKG_BUILD_DIR:=$(BUILD_DIR)/base-files
 

+BOARD:=$(shell LANG=C grep ^BR2_LINUX_2 $(TOPDIR)/.config|sed -e "s/=y//" \
+       -e "s/.*_//"| tr "[:upper:]" "[:lower:]")
+KERNEL:=$(shell LANG=C grep ^BR2_LINUX_2 $(TOPDIR)/.config|sed -e "s/=y//" \
+       -e "s/BR2_LINUX_//" -e "s/_BRCM//" -e "s/_/./"| tr "[:upper:]" "[:lower:]")
+

 REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
 ifeq ($(REV),)
 REV:=0
 REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
 ifeq ($(REV),)
 REV:=0


@@ -24,7 +29,15 @@ LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version}
 IDIR_LIBGCC:=$(PKG_BUILD_DIR)/libgcc
 IPKG_LIBGCC:=$(PACKAGE_DIR)/libgcc_$(LIBGCC_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
 
 IDIR_LIBGCC:=$(PKG_BUILD_DIR)/libgcc
 IPKG_LIBGCC:=$(PACKAGE_DIR)/libgcc_$(LIBGCC_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
 

-PACKAGES:=$(IPKG_BASE) $(IPKG_UCLIBC) $(IPKG_LIBGCC)
+PACKAGES:=$(IPKG_BASE) $(IPKG_UCLIBC) 
+PACKAGES_INSTALL:=$(IPKG_BASE) $(IPKG_UCLIBC) 
+
+ifeq ($(BR2_PACKAGE_LIBGCC),y)
+PACKAGES_INSTALL+=$(IPKG_LIBGCC)
+endif
+ifeq ($(BR2_PACKAGE_LIBGCC),m)
+PACKAGES+=$(IPKG_LIBGCC)
+endif

 
 $(PKG_BUILD_DIR)/.prepared:
        mkdir -p $(PKG_BUILD_DIR) $(PACKAGE_DIR)
 
 $(PKG_BUILD_DIR)/.prepared:
        mkdir -p $(PKG_BUILD_DIR) $(PACKAGE_DIR)


@@ -40,6 +53,7 @@ $(IPKG_BASE):
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_BASE) ipkg/$(PKG_NAME).control $(PKG_RELEASE) $(ARCH)
        cp -a ./default/* $(IDIR_BASE)
        $(SED) 's,$$R,r$(REV),g' $(IDIR_BASE)/etc/banner
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_BASE) ipkg/$(PKG_NAME).control $(PKG_RELEASE) $(ARCH)
        cp -a ./default/* $(IDIR_BASE)
        $(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)/proc
        mkdir -p $(IDIR_BASE)/jffs
        mkdir -p $(IDIR_BASE)/dev
        mkdir -p $(IDIR_BASE)/proc


@@ -82,4 +96,4 @@ prepare:
 compile-targets: $(PACKAGES)
 install-targets: compile
        mkdir -p $(TARGET_DIR)
 compile-targets: $(PACKAGES)
 install-targets: compile
        mkdir -p $(TARGET_DIR)

-       $(IPKG) install $(PACKAGES)
+       $(IPKG) install $(PACKAGES_INSTALL)