From 7619fe0848dc5f31d5c4c4cadd2ec067bd5c55d1 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 17 Jul 2005 22:52:59 +0000
Subject: move target/default/target_skeleton into package/base-files, put all
 the default files in ipkg packages, cleanup some junk in toolchain/,
 toolchain/ no longer changes build_mipsel/root

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1494 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 64 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 package/base-files/Makefile

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
new file mode 100644
index 000000000..fbd7b9e44
--- /dev/null
+++ b/package/base-files/Makefile
@@ -0,0 +1,64 @@
+# $Id$
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=base-files
+PKG_RELEASE:=1
+
+IDIR_BASE:=$(BUILD_DIR)/base-files
+IPKG_BASE:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_RELEASE)_$(ARCH).ipk
+
+LIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version}
+IDIR_LIBC:=$(BUILD_DIR)/uclibc
+IPKG_LIBC:=$(PACKAGE_DIR)/uclibc_$(LIBC_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+
+GCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version}
+IDIR_GCC:=$(BUILD_DIR)/libgcc
+IPKG_GCC:=$(PACKAGE_DIR)/libgcc_$(GCC_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+
+PACKAGES:=$(IPKG_BASE) $(IPKG_LIBC) $(IPKG_GCC)
+
+$(PACKAGE_DIR):
+	mkdir -p $(PACKAGE_DIR)
+
+$(IPKG_BASE): $(PACKAGE_DIR)
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_BASE) ipkg/$(PKG_NAME).control $(PKG_RELEASE) $(ARCH)
+	cp -a ./default/* $(IDIR_BASE)
+	mkdir -p $(IDIR_BASE)/jffs
+	mkdir -p $(IDIR_BASE)/dev
+	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
+	ln -sf /tmp/resolv.conf $(IDIR_BASE)/etc/resolv.conf
+	rm -rf $(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
+	mkdir -p $(IDIR_BASE)/etc
+	-grep \^BR2_SYSCONF $(TOPDIR)/.config > $(IDIR_BASE)/etc/sysconf
+	$(IPKG_BUILD) $(IDIR_BASE) $(PACKAGE_DIR)
+
+$(IPKG_LIBC): $(PACKAGE_DIR)
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBC) ipkg/uclibc.control $(LIBC_VERSION)-$(PKG_RELEASE) $(ARCH)
+	mkdir -p $(IDIR_LIBC)/lib
+	cp -a $(STAGING_DIR)/lib/ld-uClibc*.so* $(IDIR_LIBC)/lib/
+	for file in c crypt dl m nsl resolv rt uClibc util; do \
+		cp -a $(STAGING_DIR)/lib/lib$$file*.so* $(IDIR_LIBC)/lib/; \
+	done
+	-$(STRIP) $(IDIR_LIBC)/lib/*
+	$(IPKG_BUILD) $(IDIR_LIBC) $(PACKAGE_DIR)
+
+$(IPKG_GCC): $(PACKAGE_DIR)
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_GCC) ipkg/libgcc.control $(GCC_VERSION)-$(PKG_RELEASE) $(ARCH)
+	mkdir -p $(IDIR_GCC)/lib
+	cp -a $(STAGING_DIR)/lib/libgcc*.so* $(IDIR_GCC)/lib/
+	-$(STRIP) $(IDIR_GCC)/lib/*
+	$(IPKG_BUILD) $(IDIR_GCC) $(PACKAGE_DIR)
+
+prepare:
+compile: $(PACKAGES)
+install: compile
+	mkdir -p $(TARGET_DIR)
+	$(IPKG) install $(PACKAGES)
-- 
cgit v1.2.3


From 423c1e707c25d421c6ee7da4e779676aaab2c768 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 19 Jul 2005 00:48:36 +0000
Subject: fix base-files build

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1500 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index fbd7b9e44..c8f8f6719 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -18,10 +18,11 @@ IPKG_GCC:=$(PACKAGE_DIR)/libgcc_$(GCC_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
 
 PACKAGES:=$(IPKG_BASE) $(IPKG_LIBC) $(IPKG_GCC)
 
+$(PACKAGES): $(PACKAGE_DIR)
 $(PACKAGE_DIR):
-	mkdir -p $(PACKAGE_DIR)
+	mkdir -p $@
 
-$(IPKG_BASE): $(PACKAGE_DIR)
+$(IPKG_BASE):
 	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_BASE) ipkg/$(PKG_NAME).control $(PKG_RELEASE) $(ARCH)
 	cp -a ./default/* $(IDIR_BASE)
 	mkdir -p $(IDIR_BASE)/jffs
@@ -40,7 +41,7 @@ $(IPKG_BASE): $(PACKAGE_DIR)
 	-grep \^BR2_SYSCONF $(TOPDIR)/.config > $(IDIR_BASE)/etc/sysconf
 	$(IPKG_BUILD) $(IDIR_BASE) $(PACKAGE_DIR)
 
-$(IPKG_LIBC): $(PACKAGE_DIR)
+$(IPKG_LIBC):
 	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBC) ipkg/uclibc.control $(LIBC_VERSION)-$(PKG_RELEASE) $(ARCH)
 	mkdir -p $(IDIR_LIBC)/lib
 	cp -a $(STAGING_DIR)/lib/ld-uClibc*.so* $(IDIR_LIBC)/lib/
@@ -50,7 +51,7 @@ $(IPKG_LIBC): $(PACKAGE_DIR)
 	-$(STRIP) $(IDIR_LIBC)/lib/*
 	$(IPKG_BUILD) $(IDIR_LIBC) $(PACKAGE_DIR)
 
-$(IPKG_GCC): $(PACKAGE_DIR)
+$(IPKG_GCC):
 	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_GCC) ipkg/libgcc.control $(GCC_VERSION)-$(PKG_RELEASE) $(ARCH)
 	mkdir -p $(IDIR_GCC)/lib
 	cp -a $(STAGING_DIR)/lib/libgcc*.so* $(IDIR_GCC)/lib/
@@ -62,3 +63,5 @@ compile: $(PACKAGES)
 install: compile
 	mkdir -p $(TARGET_DIR)
 	$(IPKG) install $(PACKAGES)
+clean:
+	rm -rf $(IDIR_BASE) $(IDIR_LIBC) $(IDIR_GCC)
-- 
cgit v1.2.3


From 102ad2157b31642e029c8c176de1cc5b22c96599 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 24 Jul 2005 19:58:14 +0000
Subject: move wificonf and nvram stuff back to package/, remove
 build_mipsel/root, run install part of package/ for every board/kernel -
 fixes dependency mess

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1540 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index c8f8f6719..e2c47b51c 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -4,23 +4,29 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=base-files
 PKG_RELEASE:=1
+PKG_BUILD_DIR:=$(BUILD_DIR)/base-files
 
-IDIR_BASE:=$(BUILD_DIR)/base-files
+include $(TOPDIR)/package/rules.mk
+
+IDIR_BASE:=$(PKG_BUILD_DIR)/base-files
 IPKG_BASE:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_RELEASE)_$(ARCH).ipk
 
 LIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version}
-IDIR_LIBC:=$(BUILD_DIR)/uclibc
+IDIR_LIBC:=$(PKG_BUILD_DIR)/uclibc
 IPKG_LIBC:=$(PACKAGE_DIR)/uclibc_$(LIBC_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
 
 GCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version}
-IDIR_GCC:=$(BUILD_DIR)/libgcc
+IDIR_GCC:=$(PKG_BUILD_DIR)/libgcc
 IPKG_GCC:=$(PACKAGE_DIR)/libgcc_$(GCC_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
 
 PACKAGES:=$(IPKG_BASE) $(IPKG_LIBC) $(IPKG_GCC)
 
-$(PACKAGES): $(PACKAGE_DIR)
-$(PACKAGE_DIR):
-	mkdir -p $@
+$(PKG_BUILD_DIR)/.prepared:
+	mkdir -p $(PKG_BUILD_DIR) $(PACKAGE_DIR)
+	touch $@
+
+$(PKG_BUILD_DIR)/.built:
+	touch $@
 
 $(IPKG_BASE):
 	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_BASE) ipkg/$(PKG_NAME).control $(PKG_RELEASE) $(ARCH)
@@ -63,5 +69,3 @@ compile: $(PACKAGES)
 install: compile
 	mkdir -p $(TARGET_DIR)
 	$(IPKG) install $(PACKAGES)
-clean:
-	rm -rf $(IDIR_BASE) $(IDIR_LIBC) $(IDIR_GCC)
-- 
cgit v1.2.3


From ad14b654a6df88ea567f69c3e49510430240da9e Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 14 Aug 2005 16:15:37 +0000
Subject: add changes from whiterussian

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1665 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index e2c47b51c..f0394f84b 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -3,7 +3,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_BUILD_DIR:=$(BUILD_DIR)/base-files
 
 include $(TOPDIR)/package/rules.mk
@@ -50,9 +50,9 @@ $(IPKG_BASE):
 $(IPKG_LIBC):
 	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBC) ipkg/uclibc.control $(LIBC_VERSION)-$(PKG_RELEASE) $(ARCH)
 	mkdir -p $(IDIR_LIBC)/lib
-	cp -a $(STAGING_DIR)/lib/ld-uClibc*.so* $(IDIR_LIBC)/lib/
+	cp -fpR $(STAGING_DIR)/lib/ld-uClibc*.so.* $(IDIR_LIBC)/lib/
 	for file in c crypt dl m nsl resolv rt uClibc util; do \
-		cp -a $(STAGING_DIR)/lib/lib$$file*.so* $(IDIR_LIBC)/lib/; \
+		cp -fpR $(STAGING_DIR)/lib/lib$$file*.so.* $(IDIR_LIBC)/lib/; \
 	done
 	-$(STRIP) $(IDIR_LIBC)/lib/*
 	$(IPKG_BUILD) $(IDIR_LIBC) $(PACKAGE_DIR)
@@ -60,7 +60,7 @@ $(IPKG_LIBC):
 $(IPKG_GCC):
 	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_GCC) ipkg/libgcc.control $(GCC_VERSION)-$(PKG_RELEASE) $(ARCH)
 	mkdir -p $(IDIR_GCC)/lib
-	cp -a $(STAGING_DIR)/lib/libgcc*.so* $(IDIR_GCC)/lib/
+	cp -fpR $(STAGING_DIR)/lib/libgcc*.so.* $(IDIR_GCC)/lib/
 	-$(STRIP) $(IDIR_GCC)/lib/*
 	$(IPKG_BUILD) $(IDIR_GCC) $(PACKAGE_DIR)
 
-- 
cgit v1.2.3


From aba665700f991d8a256729415eb28c1d32f80798 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 15 Aug 2005 10:43:09 +0000
Subject: add fixes from whiterussian

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1683 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index f0394f84b..af60bafac 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -50,9 +50,9 @@ $(IPKG_BASE):
 $(IPKG_LIBC):
 	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBC) ipkg/uclibc.control $(LIBC_VERSION)-$(PKG_RELEASE) $(ARCH)
 	mkdir -p $(IDIR_LIBC)/lib
-	cp -fpR $(STAGING_DIR)/lib/ld-uClibc*.so.* $(IDIR_LIBC)/lib/
+	cp $(STAGING_DIR)/lib/ld-uClibc*.so.* $(IDIR_LIBC)/lib/
 	for file in c crypt dl m nsl resolv rt uClibc util; do \
-		cp -fpR $(STAGING_DIR)/lib/lib$$file*.so.* $(IDIR_LIBC)/lib/; \
+		cp $(STAGING_DIR)/lib/lib$$file*.so.* $(IDIR_LIBC)/lib/; \
 	done
 	-$(STRIP) $(IDIR_LIBC)/lib/*
 	$(IPKG_BUILD) $(IDIR_LIBC) $(PACKAGE_DIR)
@@ -64,6 +64,9 @@ $(IPKG_GCC):
 	-$(STRIP) $(IDIR_GCC)/lib/*
 	$(IPKG_BUILD) $(IDIR_GCC) $(PACKAGE_DIR)
 
+package-clean:
+	rm -f $(PACKAGES)
+clean: package-clean
 prepare:
 compile: $(PACKAGES)
 install: compile
-- 
cgit v1.2.3


From d37c5c518e40e35a4b21281c86de7ba2ab1df439 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 27 Aug 2005 15:40:56 +0000
Subject: move hotplug script into an extra package so that it doesn't conflict
 with nas

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1772 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index af60bafac..9cca04a73 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -11,6 +11,9 @@ include $(TOPDIR)/package/rules.mk
 IDIR_BASE:=$(PKG_BUILD_DIR)/base-files
 IPKG_BASE:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_RELEASE)_$(ARCH).ipk
 
+IDIR_HOTPLUG:=$(PKG_BUILD_DIR)/hotplug
+IPKG_HOTPLUG:=$(PACKAGE_DIR)/hotplug_$(PKG_RELEASE)_$(ARCH).ipk
+
 LIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version}
 IDIR_LIBC:=$(PKG_BUILD_DIR)/uclibc
 IPKG_LIBC:=$(PACKAGE_DIR)/uclibc_$(LIBC_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
@@ -19,7 +22,7 @@ GCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version}
 IDIR_GCC:=$(PKG_BUILD_DIR)/libgcc
 IPKG_GCC:=$(PACKAGE_DIR)/libgcc_$(GCC_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
 
-PACKAGES:=$(IPKG_BASE) $(IPKG_LIBC) $(IPKG_GCC)
+PACKAGES:=$(IPKG_BASE) $(IPKG_LIBC) $(IPKG_GCC) $(IPKG_HOTPLUG)
 
 $(PKG_BUILD_DIR)/.prepared:
 	mkdir -p $(PKG_BUILD_DIR) $(PACKAGE_DIR)
@@ -43,6 +46,7 @@ $(IPKG_BASE):
 	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)
@@ -64,6 +68,12 @@ $(IPKG_GCC):
 	-$(STRIP) $(IDIR_GCC)/lib/*
 	$(IPKG_BUILD) $(IDIR_GCC) $(PACKAGE_DIR)
 
+$(IPKG_HOTPLUG):
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_HOTPLUG) ipkg/hotplug.control $(PKG_RELEASE) $(ARCH)
+	mkdir -p $(IDIR_HOTPLUG)/sbin
+	install -m0755 files/hotplug $(IDIR_HOTPLUG)/sbin
+	$(IPKG_BUILD) $(IDIR_HOTPLUG) $(PACKAGE_DIR)
+	
 package-clean:
 	rm -f $(PACKAGES)
 clean: package-clean
-- 
cgit v1.2.3


From 6b53157103d462f7ea0b81f9fe77412719ea2260 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 22 Oct 2005 12:12:59 +0000
Subject: lots of small package changes and dependency cleanups for the V=
 stuff

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2230 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 9cca04a73..78e1f0a53 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -76,9 +76,10 @@ $(IPKG_HOTPLUG):
 	
 package-clean:
 	rm -f $(PACKAGES)
-clean: package-clean
+	
+clean-targets: package-clean
 prepare:
-compile: $(PACKAGES)
-install: compile
+compile-targets: $(PACKAGES)
+install-targets: compile
 	mkdir -p $(TARGET_DIR)
 	$(IPKG) install $(PACKAGES)
-- 
cgit v1.2.3


From c4f83c2d4e8238e6aee9363b58e38d1ab17c36f5 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 22 Oct 2005 16:34:35 +0000
Subject: add svn revision to /etc/banner

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2246 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 78e1f0a53..c1dd8c69f 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,6 +6,11 @@ PKG_NAME:=base-files
 PKG_RELEASE:=2
 PKG_BUILD_DIR:=$(BUILD_DIR)/base-files
 
+REV:=${shell svn info | grep Revision | cut -d ' ' -f 2}
+ifeq ($(REV),)
+REV:=0
+endif
+
 include $(TOPDIR)/package/rules.mk
 
 IDIR_BASE:=$(PKG_BUILD_DIR)/base-files
@@ -34,6 +39,7 @@ $(PKG_BUILD_DIR)/.built:
 $(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
 	mkdir -p $(IDIR_BASE)/jffs
 	mkdir -p $(IDIR_BASE)/dev
 	mkdir -p $(IDIR_BASE)/proc
-- 
cgit v1.2.3


From 3c8c1d5d8129266fead520436949c40d62813d1f Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 22 Oct 2005 19:54:33 +0000
Subject: add base-files change from whiterussian

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2257 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index c1dd8c69f..869e3c67d 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -3,7 +3,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=2
+PKG_RELEASE:=4
 PKG_BUILD_DIR:=$(BUILD_DIR)/base-files
 
 REV:=${shell svn info | grep Revision | cut -d ' ' -f 2}
-- 
cgit v1.2.3


From 8c22b3ad4ccb0aa3fa3fd378af8ca4c0de5b0d33 Mon Sep 17 00:00:00 2001
From: kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 23 Oct 2005 18:12:01 +0000
Subject: turn tcp vegas on by default

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2282 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 869e3c67d..2c202325e 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -3,7 +3,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 PKG_BUILD_DIR:=$(BUILD_DIR)/base-files
 
 REV:=${shell svn info | grep Revision | cut -d ' ' -f 2}
-- 
cgit v1.2.3


From 50dcf5b0d071e212c11083beb38005194387d4e8 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 23 Oct 2005 19:04:30 +0000
Subject: set base-files version number back to 4

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2286 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 2c202325e..869e3c67d 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -3,7 +3,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=5
+PKG_RELEASE:=4
 PKG_BUILD_DIR:=$(BUILD_DIR)/base-files
 
 REV:=${shell svn info | grep Revision | cut -d ' ' -f 2}
-- 
cgit v1.2.3


From c21687c9c8cb80a029017322ff416201d0b09288 Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 2 Nov 2005 02:48:48 +0000
Subject: backport base-files fix from whiterussian [2308], sanitize variable
 names

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2313 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 869e3c67d..5f300f284 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -19,15 +19,15 @@ IPKG_BASE:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_RELEASE)_$(ARCH).ipk
 IDIR_HOTPLUG:=$(PKG_BUILD_DIR)/hotplug
 IPKG_HOTPLUG:=$(PACKAGE_DIR)/hotplug_$(PKG_RELEASE)_$(ARCH).ipk
 
-LIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version}
-IDIR_LIBC:=$(PKG_BUILD_DIR)/uclibc
-IPKG_LIBC:=$(PACKAGE_DIR)/uclibc_$(LIBC_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version}
+IDIR_UCLIBC:=$(PKG_BUILD_DIR)/uclibc
+IPKG_UCLIBC:=$(PACKAGE_DIR)/uclibc_$(UCLIBC_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
 
-GCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version}
-IDIR_GCC:=$(PKG_BUILD_DIR)/libgcc
-IPKG_GCC:=$(PACKAGE_DIR)/libgcc_$(GCC_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+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
 
-PACKAGES:=$(IPKG_BASE) $(IPKG_LIBC) $(IPKG_GCC) $(IPKG_HOTPLUG)
+PACKAGES:=$(IPKG_BASE) $(IPKG_UCLIBC) $(IPKG_LIBGCC) $(IPKG_HOTPLUG)
 
 $(PKG_BUILD_DIR)/.prepared:
 	mkdir -p $(PKG_BUILD_DIR) $(PACKAGE_DIR)
@@ -57,22 +57,22 @@ $(IPKG_BASE):
 	-grep \^BR2_SYSCONF $(TOPDIR)/.config > $(IDIR_BASE)/etc/sysconf
 	$(IPKG_BUILD) $(IDIR_BASE) $(PACKAGE_DIR)
 
-$(IPKG_LIBC):
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBC) ipkg/uclibc.control $(LIBC_VERSION)-$(PKG_RELEASE) $(ARCH)
-	mkdir -p $(IDIR_LIBC)/lib
-	cp $(STAGING_DIR)/lib/ld-uClibc*.so.* $(IDIR_LIBC)/lib/
-	for file in c crypt dl m nsl resolv rt uClibc util; do \
-		cp $(STAGING_DIR)/lib/lib$$file*.so.* $(IDIR_LIBC)/lib/; \
+$(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/; \
 	done
-	-$(STRIP) $(IDIR_LIBC)/lib/*
-	$(IPKG_BUILD) $(IDIR_LIBC) $(PACKAGE_DIR)
+	-$(STRIP) $(IDIR_UCLIBC)/lib/*
+	$(IPKG_BUILD) $(IDIR_UCLIBC) $(PACKAGE_DIR)
 
-$(IPKG_GCC):
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_GCC) ipkg/libgcc.control $(GCC_VERSION)-$(PKG_RELEASE) $(ARCH)
-	mkdir -p $(IDIR_GCC)/lib
-	cp -fpR $(STAGING_DIR)/lib/libgcc*.so.* $(IDIR_GCC)/lib/
-	-$(STRIP) $(IDIR_GCC)/lib/*
-	$(IPKG_BUILD) $(IDIR_GCC) $(PACKAGE_DIR)
+$(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/
+	-$(STRIP) $(IDIR_LIBGCC)/lib/*
+	$(IPKG_BUILD) $(IDIR_LIBGCC) $(PACKAGE_DIR)
 
 $(IPKG_HOTPLUG):
 	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_HOTPLUG) ipkg/hotplug.control $(PKG_RELEASE) $(ARCH)
-- 
cgit v1.2.3


From 0bb68e81eca839c8eed0c629b403ac558ea662e6 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 7 Nov 2005 01:12:51 +0000
Subject: add hotplug stuff to trunk/

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2364 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 5f300f284..adf2ffbb5 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -3,7 +3,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=4
+PKG_RELEASE:=6
 PKG_BUILD_DIR:=$(BUILD_DIR)/base-files
 
 REV:=${shell svn info | grep Revision | cut -d ' ' -f 2}
@@ -16,9 +16,6 @@ include $(TOPDIR)/package/rules.mk
 IDIR_BASE:=$(PKG_BUILD_DIR)/base-files
 IPKG_BASE:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_RELEASE)_$(ARCH).ipk
 
-IDIR_HOTPLUG:=$(PKG_BUILD_DIR)/hotplug
-IPKG_HOTPLUG:=$(PACKAGE_DIR)/hotplug_$(PKG_RELEASE)_$(ARCH).ipk
-
 UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version}
 IDIR_UCLIBC:=$(PKG_BUILD_DIR)/uclibc
 IPKG_UCLIBC:=$(PACKAGE_DIR)/uclibc_$(UCLIBC_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
@@ -27,7 +24,7 @@ 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
 
-PACKAGES:=$(IPKG_BASE) $(IPKG_UCLIBC) $(IPKG_LIBGCC) $(IPKG_HOTPLUG)
+PACKAGES:=$(IPKG_BASE) $(IPKG_UCLIBC) $(IPKG_LIBGCC)
 
 $(PKG_BUILD_DIR)/.prepared:
 	mkdir -p $(PKG_BUILD_DIR) $(PACKAGE_DIR)
@@ -74,12 +71,6 @@ $(IPKG_LIBGCC):
 	-$(STRIP) $(IDIR_LIBGCC)/lib/*
 	$(IPKG_BUILD) $(IDIR_LIBGCC) $(PACKAGE_DIR)
 
-$(IPKG_HOTPLUG):
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_HOTPLUG) ipkg/hotplug.control $(PKG_RELEASE) $(ARCH)
-	mkdir -p $(IDIR_HOTPLUG)/sbin
-	install -m0755 files/hotplug $(IDIR_HOTPLUG)/sbin
-	$(IPKG_BUILD) $(IDIR_HOTPLUG) $(PACKAGE_DIR)
-	
 package-clean:
 	rm -f $(PACKAGES)
 	
-- 
cgit v1.2.3


From 436e81c542050e2d0fbba730912bb4ddb133abf6 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 7 Nov 2005 18:12:11 +0000
Subject: more cosmetic makefile fixes

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2387 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index adf2ffbb5..48099c947 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -30,6 +30,9 @@ $(PKG_BUILD_DIR)/.prepared:
 	mkdir -p $(PKG_BUILD_DIR) $(PACKAGE_DIR)
 	touch $@
 
+$(PKG_BUILD_DIR)/.configured:
+	touch $@
+
 $(PKG_BUILD_DIR)/.built:
 	touch $@
 
-- 
cgit v1.2.3


From 54aceb5cebcd47b29ab7a7cfe474dd2a8ed9648c Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 27 Nov 2005 19:59:03 +0000
Subject: don't use locales when retrieving subversion release number (closes:
 #54)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2557 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 48099c947..16169fa28 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ PKG_NAME:=base-files
 PKG_RELEASE:=6
 PKG_BUILD_DIR:=$(BUILD_DIR)/base-files
 
-REV:=${shell svn info | grep Revision | cut -d ' ' -f 2}
+REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
 ifeq ($(REV),)
 REV:=0
 endif
-- 
cgit v1.2.3


From 6535064031e51f8bef584e7c6b6431c2efbe4566 Mon Sep 17 00:00:00 2001
From: wbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 25 Dec 2005 00:56:25 +0000
Subject: change ipkg.conf to use snapshots

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2765 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 16169fa28..8b74ee0d9 100644
--- 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
 
+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
@@ -40,6 +45,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
+	$(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
-- 
cgit v1.2.3


From 93a1cc78a58b1d0c95b81343e5e72910201352dd Mon Sep 17 00:00:00 2001
From: wbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 4 Jan 2006 08:37:19 +0000
Subject: patch for spec file of gcc 3.4.4, so that libgss library is not
 automatically linked into every binary. explicitely link it into needed
 packages (kismet, nmap, samba) and add dependencies. idea and patch from
 sven-ola, thx. Saves 16 kb in the default squashfs images.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2817 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 8b74ee0d9..7601de2ad 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -29,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
 
-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)
@@ -88,4 +96,4 @@ prepare:
 compile-targets: $(PACKAGES)
 install-targets: compile
 	mkdir -p $(TARGET_DIR)
-	$(IPKG) install $(PACKAGES)
+	$(IPKG) install $(PACKAGES_INSTALL)
-- 
cgit v1.2.3


From 972fedb946f1f961b9dea724d50404ec9249d1a9 Mon Sep 17 00:00:00 2001
From: wbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 20 Jan 2006 14:11:31 +0000
Subject: build libgcc when selected as builtin, fix from Ge0rG via
 irc.freenode.net, thx

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3027 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 7601de2ad..958262761 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -33,6 +33,7 @@ PACKAGES:=$(IPKG_BASE) $(IPKG_UCLIBC)
 PACKAGES_INSTALL:=$(IPKG_BASE) $(IPKG_UCLIBC) 
 
 ifeq ($(BR2_PACKAGE_LIBGCC),y)
+PACKAGES+=$(IPKG_LIBGCC)
 PACKAGES_INSTALL+=$(IPKG_LIBGCC)
 endif
 ifeq ($(BR2_PACKAGE_LIBGCC),m)
-- 
cgit v1.2.3


From 46225926c8c36b914ad7423bb7e6f36a42b92298 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 1 Feb 2006 10:47:17 +0000
Subject: move sysfs to mount_root

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3107 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 958262761..e4753d045 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -55,6 +55,7 @@ $(IPKG_BASE):
 	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)/sys
 	mkdir -p $(IDIR_BASE)/jffs
 	mkdir -p $(IDIR_BASE)/dev
 	mkdir -p $(IDIR_BASE)/proc
-- 
cgit v1.2.3


From 82daa5e9c007b2a16aa9e8c5526fd8d034ee4541 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 1 Feb 2006 23:53:19 +0000
Subject: change cp to $(CP)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3112 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index e4753d045..2604e6257 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -52,7 +52,7 @@ $(PKG_BUILD_DIR)/.built:
 
 $(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
 	mkdir -p $(IDIR_BASE)/sys
@@ -77,8 +77,8 @@ $(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)
@@ -86,7 +86,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
-	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)
 
-- 
cgit v1.2.3


From 577eddc90d9b794f4419f0df1c4bc04109762626 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 31 Mar 2006 18:25:00 +0000
Subject: link /proc/mounts to /etc/mtab (fixes mkfs.ext3 issues)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3561 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 2604e6257..1fb0c1449 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -64,6 +64,7 @@ $(IPKG_BASE):
 	mkdir -p $(IDIR_BASE)/usr/lib
 	mkdir -p $(IDIR_BASE)/usr/bin
 	ln -sf /tmp/resolv.conf $(IDIR_BASE)/etc/resolv.conf
+	ln -sf /proc/mounts $(IDIR_BASE)/etc/mtab
 	rm -rf $(IDIR_BASE)/var
 	ln -sf /tmp $(IDIR_BASE)/var
 	-find $(IDIR_BASE) -type d -name CVS | xargs rm -rf
-- 
cgit v1.2.3


From 676c017ecfced2e37aeec176f8aa6b9df90024f3 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 5 Apr 2006 02:09:22 +0000
Subject: large init script cleanup and merge of whiterussian changes, new
 dnsmasq config handling

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3588 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 1fb0c1449..8517dcc68 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -55,23 +55,25 @@ $(IPKG_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
-	mkdir -p $(IDIR_BASE)/sys
-	mkdir -p $(IDIR_BASE)/jffs
 	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)/lib
 	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 /proc/mounts $(IDIR_BASE)/etc/mtab
-	rm -rf $(IDIR_BASE)/var
+	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
-	-grep \^BR2_SYSCONF $(TOPDIR)/.config > $(IDIR_BASE)/etc/sysconf
 	$(IPKG_BUILD) $(IDIR_BASE) $(PACKAGE_DIR)
 
 $(IPKG_UCLIBC):
-- 
cgit v1.2.3


From f47790856c089dd077ca817ad94820a65b755686 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 15 May 2006 23:13:49 +0000
Subject: more BR2_ / CONFIG_ patches

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3784 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 8517dcc68..90820cf91 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,10 +6,10 @@ PKG_NAME:=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//" \
+BOARD:=$(shell LANG=C grep ^CONFIG_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:]")
+KERNEL:=$(shell LANG=C grep ^CONFIG_LINUX_2 $(TOPDIR)/.config|sed -e "s/=y//" \
+	-e "s/CONFIG_LINUX_//" -e "s/_BRCM//" -e "s/_/./"| tr "[:upper:]" "[:lower:]")
 
 REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
 ifeq ($(REV),)
@@ -32,11 +32,11 @@ IPKG_LIBGCC:=$(PACKAGE_DIR)/libgcc_$(LIBGCC_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
 PACKAGES:=$(IPKG_BASE) $(IPKG_UCLIBC) 
 PACKAGES_INSTALL:=$(IPKG_BASE) $(IPKG_UCLIBC) 
 
-ifeq ($(BR2_PACKAGE_LIBGCC),y)
+ifeq ($(CONFIG_PACKAGE_LIBGCC),y)
 PACKAGES+=$(IPKG_LIBGCC)
 PACKAGES_INSTALL+=$(IPKG_LIBGCC)
 endif
-ifeq ($(BR2_PACKAGE_LIBGCC),m)
+ifeq ($(CONFIG_PACKAGE_LIBGCC),m)
 PACKAGES+=$(IPKG_LIBGCC)
 endif
 
-- 
cgit v1.2.3


From 34d342e6d4f3455204b3d189ad093e6c7eb2361d Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 30 May 2006 20:22:58 +0000
Subject: convert base-files to new format

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3849 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 154 +++++++++++++++++++++-----------------------
 1 file changed, 72 insertions(+), 82 deletions(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 90820cf91..252fa7eba 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 PKG_BUILD_DIR:=$(BUILD_DIR)/base-files
 
-BOARD:=$(shell LANG=C grep ^CONFIG_LINUX_2 $(TOPDIR)/.config|sed -e "s/=y//" \
+BOARD:=$(shell LANG=C grep ^CONFIG_LINUX_2_._ $(TOPDIR)/.config|sed -e "s/=y//" \
 	-e "s/.*_//"| tr "[:upper:]" "[:lower:]")
-KERNEL:=$(shell LANG=C grep ^CONFIG_LINUX_2 $(TOPDIR)/.config|sed -e "s/=y//" \
+KERNEL:=$(shell LANG=C grep ^CONFIG_LINUX_2_._ $(TOPDIR)/.config|sed -e "s/=y//" \
 	-e "s/CONFIG_LINUX_//" -e "s/_BRCM//" -e "s/_/./"| tr "[:upper:]" "[:lower:]")
 
 REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
@@ -18,87 +18,77 @@ endif
 
 include $(TOPDIR)/package/rules.mk
 
-IDIR_BASE:=$(PKG_BUILD_DIR)/base-files
-IPKG_BASE:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_RELEASE)_$(ARCH).ipk
-
-UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version}
-IDIR_UCLIBC:=$(PKG_BUILD_DIR)/uclibc
-IPKG_UCLIBC:=$(PACKAGE_DIR)/uclibc_$(UCLIBC_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-
-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
-
-PACKAGES:=$(IPKG_BASE) $(IPKG_UCLIBC) 
-PACKAGES_INSTALL:=$(IPKG_BASE) $(IPKG_UCLIBC) 
-
-ifeq ($(CONFIG_PACKAGE_LIBGCC),y)
-PACKAGES+=$(IPKG_LIBGCC)
-PACKAGES_INSTALL+=$(IPKG_LIBGCC)
-endif
-ifeq ($(CONFIG_PACKAGE_LIBGCC),m)
-PACKAGES+=$(IPKG_LIBGCC)
-endif
-
-$(PKG_BUILD_DIR)/.prepared:
-	mkdir -p $(PKG_BUILD_DIR) $(PACKAGE_DIR)
-	touch $@
-
-$(PKG_BUILD_DIR)/.configured:
-	touch $@
-
-$(PKG_BUILD_DIR)/.built:
-	touch $@
-
-$(IPKG_BASE):
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_BASE) ipkg/$(PKG_NAME).control $(PKG_RELEASE) $(ARCH)
-	$(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
-	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)/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 /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
-	$(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
+define Package/base-files
+ SECTION:=base
+ CATEGORY:=Base system
+ DEFAULT:=y
+ TITLE:=OpenWrt system scripts
+ DESCRIPTION:=OpenWrt system scripts
+endef
+
+
+define Package/libgcc
+ SECTION:=libs
+ CATEGORY:=Libraries
+ DEFAULT:=m, y if GCC_VERSION_4_0_2 || GCC_VERSION_4_0_3 || GCC_VERSION_4_1_0
+ TITLE:=GCC support library
+ VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
+ DESCRIPTION:=$(TITLE)
+endef
+
+define Package/uclibc
+ $(call Package/base-files)
+ VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
+ TITLE:=C library
+ DESCRIPTION:=C library for embedded systems
+endef
+
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+endef
+
+define Build/Compile
+endef
+
+define Package/base-files/install
+	$(CP) ./default/* $(1)
+	$(SED) 's,$$R,r$(REV),g' $(1)/etc/banner
+	$(SED) 's,$$S,$(BOARD)-$(KERNEL),g' $(1)/etc/ipkg.conf
+	mkdir -p $(1)/dev
+	mkdir -p $(1)/etc/crontabs
+	mkdir -p $(1)/jffs
+	mkdir -p $(1)/lib
+	mkdir -p $(1)/mnt
+	mkdir -p $(1)/proc
+	mkdir -p $(1)/tmp
+	mkdir -p $(1)/usr/lib
+	mkdir -p $(1)/usr/bin
+	mkdir -p $(1)/sys
+	mkdir -p $(1)/www
+	ln -sf /tmp/resolv.conf $(1)/etc/resolv.conf
+	ln -sf /proc/mounts $(1)/etc/mtab
+	rm -f $(1)/var
+	ln -sf /tmp $(1)/var
+	-find $(1) -type d -name CVS | xargs rm -rf
+	-find $(1) -type d -name .svn | xargs rm -rf
+	-find $(1) -name '.#*' | xargs rm -f
+	mkdir -p $(1)/etc
+endef
+
+define Package/uclibc/install
+	mkdir -p $(1)/lib
 	for file in ld-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \
-		$(CP) $(STAGING_DIR)/lib/$$file.so.* $(IDIR_UCLIBC)/lib/; \
-		$(CP) $(STAGING_DIR)/lib/$$file-$(UCLIBC_VERSION).so $(IDIR_UCLIBC)/lib/; \
+		$(CP) $(STAGING_DIR)/lib/$$file.so.* $(1)/lib/; \
+		$(CP) $(STAGING_DIR)/lib/$$file-$(UCLIBC_VERSION).so $(1)/lib/; \
 	done
-	-$(STRIP) $(IDIR_UCLIBC)/lib/*
-	$(IPKG_BUILD) $(IDIR_UCLIBC) $(PACKAGE_DIR)
+endef
 
-$(IPKG_LIBGCC):
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBGCC) ipkg/libgcc.control $(LIBGCC_VERSION)-$(PKG_RELEASE) $(ARCH)
+define Package/libgcc/install
 	mkdir -p $(IDIR_LIBGCC)/lib
 	$(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(IDIR_LIBGCC)/lib/
-	-$(STRIP) $(IDIR_LIBGCC)/lib/*
-	$(IPKG_BUILD) $(IDIR_LIBGCC) $(PACKAGE_DIR)
-
-package-clean:
-	rm -f $(PACKAGES)
-	
-clean-targets: package-clean
-prepare:
-compile-targets: $(PACKAGES)
-install-targets: compile
-	mkdir -p $(TARGET_DIR)
-	$(IPKG) install $(PACKAGES_INSTALL)
+endef
+
+$(eval $(call BuildPackage,base-files))
+$(eval $(call BuildPackage,libgcc))
+$(eval $(call BuildPackage,uclibc))
-- 
cgit v1.2.3


From 3c17bb247ff2d9260af8dccad333b52b70d299e7 Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 31 May 2006 06:49:51 +0000
Subject: fix base-files packages build.

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3852 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 252fa7eba..263794969 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -18,6 +18,10 @@ endif
 
 include $(TOPDIR)/package/rules.mk
 
+#FIXME: use the version from ./toolchain/uclibc
+UCLIBC_VERSION:=0.9.28
+LIBGCC_VERSION:=$(CONFIG_GCC_VERSION)
+
 define Package/base-files
  SECTION:=base
  CATEGORY:=Base system
@@ -26,7 +30,6 @@ define Package/base-files
  DESCRIPTION:=OpenWrt system scripts
 endef
 
-
 define Package/libgcc
  SECTION:=libs
  CATEGORY:=Libraries
@@ -53,8 +56,8 @@ endef
 
 define Package/base-files/install
 	$(CP) ./default/* $(1)
-	$(SED) 's,$$R,r$(REV),g' $(1)/etc/banner
-	$(SED) 's,$$S,$(BOARD)-$(KERNEL),g' $(1)/etc/ipkg.conf
+	$(SED) 's,$$$$R,r$(REV),g' $(1)/etc/banner
+	$(SED) 's,$$$$S,$(BOARD)-$(KERNEL),g' $(1)/etc/ipkg.conf
 	mkdir -p $(1)/dev
 	mkdir -p $(1)/etc/crontabs
 	mkdir -p $(1)/jffs
@@ -79,14 +82,14 @@ endef
 define Package/uclibc/install
 	mkdir -p $(1)/lib
 	for file in ld-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \
-		$(CP) $(STAGING_DIR)/lib/$$file.so.* $(1)/lib/; \
-		$(CP) $(STAGING_DIR)/lib/$$file-$(UCLIBC_VERSION).so $(1)/lib/; \
+		$(CP) $(STAGING_DIR)/lib/$$$$file.so.* $(1)/lib/; \
+		$(CP) $(STAGING_DIR)/lib/$$$$file-$(UCLIBC_VERSION).so $(1)/lib/; \
 	done
 endef
 
 define Package/libgcc/install
-	mkdir -p $(IDIR_LIBGCC)/lib
-	$(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(IDIR_LIBGCC)/lib/
+	mkdir -p $(1)/lib
+	$(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(1)/lib/
 endef
 
 $(eval $(call BuildPackage,base-files))
-- 
cgit v1.2.3


From f21c448c6d0ec4a3b61c4d826eb8c1b668e10409 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 31 May 2006 12:33:06 +0000
Subject: allow building of kernel-specific stuff in package/ instead of
 target/linux/package/ and merge target/linux/package/base-files into
 package/base-files

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3855 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 54 +++++++++++++++++++++++++++++++++------------
 1 file changed, 40 insertions(+), 14 deletions(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 263794969..536857657 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -3,14 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 PKG_BUILD_DIR:=$(BUILD_DIR)/base-files
 
-BOARD:=$(shell LANG=C grep ^CONFIG_LINUX_2_._ $(TOPDIR)/.config|sed -e "s/=y//" \
-	-e "s/.*_//"| tr "[:upper:]" "[:lower:]")
-KERNEL:=$(shell LANG=C grep ^CONFIG_LINUX_2_._ $(TOPDIR)/.config|sed -e "s/=y//" \
-	-e "s/CONFIG_LINUX_//" -e "s/_BRCM//" -e "s/_/./"| tr "[:upper:]" "[:lower:]")
-
 REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
 ifeq ($(REV),)
 REV:=0
@@ -18,16 +13,23 @@ endif
 
 include $(TOPDIR)/package/rules.mk
 
-#FIXME: use the version from ./toolchain/uclibc
-UCLIBC_VERSION:=0.9.28
-LIBGCC_VERSION:=$(CONFIG_GCC_VERSION)
+ifneq ($(DUMP),1)
+include $(BUILD_DIR)/kernel.mk
+include $(TOPDIR)/target/linux/rules.mk
+TARGET:=-$(BOARD)-$(KERNEL)
+
+UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version}
+LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version}
+endif
+
+CONFIG_PACKAGE_base-files$(TARGET):=CONFIG_PACKAGE_base-files
 
-define Package/base-files
+define Package/base-files$(TARGET)
  SECTION:=base
  CATEGORY:=Base system
  DEFAULT:=y
  TITLE:=OpenWrt system scripts
- DESCRIPTION:=OpenWrt system scripts
+ DESCRIPTION:=Base filesystem for OpenWrt
 endef
 
 define Package/libgcc
@@ -40,7 +42,7 @@ define Package/libgcc
 endef
 
 define Package/uclibc
- $(call Package/base-files)
+ $(call Package/base-files$(TARGET))
  VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
  TITLE:=C library
  DESCRIPTION:=C library for embedded systems
@@ -51,11 +53,35 @@ define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)
 endef
 
+
+define Build/Compile/ar7
+	$(TARGET_CC) -o $(PKG_BUILD_DIR)/adam2patcher src/adam2patcher.c
+endef
+
+define Build/Compile/brcm
+	$(TARGET_CC) -o $(PKG_BUILD_DIR)/jffs2root src/jffs2root.c
+endef
+
 define Build/Compile
+$(call Build/Compile/$(BOARD))
+endef
+
+
+define Package/base-files$(TARGET)/install-ar7
+	mkdir -p $(1)/sbin
+	$(CP) $(PKG_BUILD_DIR)/adam2patcher $(1)/sbin
+endef
+define Package/base-files$(TARGET)/install-brcm
+	mkdir -p $(1)/sbin
+	$(CP) $(PKG_BUILD_DIR)/jffs2root $(1)/sbin
 endef
 
-define Package/base-files/install
+define Package/base-files$(TARGET)/install
+$(call Package/base-files$(TARGET)/install-$(BOARD),$(1))
 	$(CP) ./default/* $(1)
+	if [ -d $(BOARD)-$(KERNEL) ]; then \
+		$(CP) $(BOARD)-$(KERNEL)/* $(1)/; \
+	fi
 	$(SED) 's,$$$$R,r$(REV),g' $(1)/etc/banner
 	$(SED) 's,$$$$S,$(BOARD)-$(KERNEL),g' $(1)/etc/ipkg.conf
 	mkdir -p $(1)/dev
@@ -92,6 +118,6 @@ define Package/libgcc/install
 	$(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(1)/lib/
 endef
 
-$(eval $(call BuildPackage,base-files))
+$(eval $(call BuildPackage,base-files$(TARGET)))
 $(eval $(call BuildPackage,libgcc))
 $(eval $(call BuildPackage,uclibc))
-- 
cgit v1.2.3


From 83ce4604cc2e3af0c4d5bade14a4ee74875c34ba Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 31 May 2006 13:27:11 +0000
Subject: cleanup; change base-files build directory

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3858 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 536857657..485ebddc3 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -2,6 +2,16 @@
 
 include $(TOPDIR)/rules.mk
 
+ifneq ($(DUMP),1)
+include $(BUILD_DIR)/kernel.mk
+include $(TOPDIR)/target/linux/rules.mk
+TARGET:=-$(BOARD)-$(KERNEL)
+BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
+
+UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version}
+LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version}
+endif
+
 PKG_NAME:=base-files
 PKG_RELEASE:=8
 PKG_BUILD_DIR:=$(BUILD_DIR)/base-files
@@ -13,15 +23,6 @@ endif
 
 include $(TOPDIR)/package/rules.mk
 
-ifneq ($(DUMP),1)
-include $(BUILD_DIR)/kernel.mk
-include $(TOPDIR)/target/linux/rules.mk
-TARGET:=-$(BOARD)-$(KERNEL)
-
-UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version}
-LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version}
-endif
-
 CONFIG_PACKAGE_base-files$(TARGET):=CONFIG_PACKAGE_base-files
 
 define Package/base-files$(TARGET)
@@ -99,9 +100,6 @@ $(call Package/base-files$(TARGET)/install-$(BOARD),$(1))
 	ln -sf /proc/mounts $(1)/etc/mtab
 	rm -f $(1)/var
 	ln -sf /tmp $(1)/var
-	-find $(1) -type d -name CVS | xargs rm -rf
-	-find $(1) -type d -name .svn | xargs rm -rf
-	-find $(1) -name '.#*' | xargs rm -f
 	mkdir -p $(1)/etc
 endef
 
-- 
cgit v1.2.3


From 9e0015224dd9496dcbeef5c6eaa5af7232ff7b9b Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 31 May 2006 14:32:17 +0000
Subject: kernel package cleanup, move madwifi from target/linux/package/ to
 package/, update to 0.9.0

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3860 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 485ebddc3..226782bb9 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -1,20 +1,11 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
-
-ifneq ($(DUMP),1)
-include $(BUILD_DIR)/kernel.mk
-include $(TOPDIR)/target/linux/rules.mk
-TARGET:=-$(BOARD)-$(KERNEL)
-BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
-
-UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version}
-LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version}
-endif
+include $(TOPDIR)/package/kernel.mk
 
 PKG_NAME:=base-files
 PKG_RELEASE:=8
-PKG_BUILD_DIR:=$(BUILD_DIR)/base-files
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/base-files
 
 REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
 ifeq ($(REV),)
@@ -23,6 +14,12 @@ endif
 
 include $(TOPDIR)/package/rules.mk
 
+ifneq ($(DUMP),1)
+TARGET:=-$(BOARD)-$(KERNEL)
+UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version}
+LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version}
+endif
+
 CONFIG_PACKAGE_base-files$(TARGET):=CONFIG_PACKAGE_base-files
 
 define Package/base-files$(TARGET)
@@ -49,7 +46,6 @@ define Package/uclibc
  DESCRIPTION:=C library for embedded systems
 endef
 
-
 define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)
 endef
-- 
cgit v1.2.3


From 50a26cd5e29260ae1cc3a8dd0f19abe26d8e94ef Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 1 Jun 2006 23:20:10 +0000
Subject: fix base-files version number

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3888 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 226782bb9..014d4b731 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -28,6 +28,7 @@ define Package/base-files$(TARGET)
  DEFAULT:=y
  TITLE:=OpenWrt system scripts
  DESCRIPTION:=Base filesystem for OpenWrt
+ VERSION:=$(PKG_RELEASE)
 endef
 
 define Package/libgcc
-- 
cgit v1.2.3


From 716ea883948a9ce031d5387c0018bd3d26b19f64 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 2 Jun 2006 16:03:03 +0000
Subject: fix a typo that prevents base-files from being installed

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3894 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 014d4b731..23152c11d 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -20,7 +20,7 @@ UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version}
 LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version}
 endif
 
-CONFIG_PACKAGE_base-files$(TARGET):=CONFIG_PACKAGE_base-files
+CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files)
 
 define Package/base-files$(TARGET)
  SECTION:=base
@@ -76,7 +76,7 @@ endef
 
 define Package/base-files$(TARGET)/install
 $(call Package/base-files$(TARGET)/install-$(BOARD),$(1))
-	$(CP) ./default/* $(1)
+	$(CP) ./default/* $(1)/
 	if [ -d $(BOARD)-$(KERNEL) ]; then \
 		$(CP) $(BOARD)-$(KERNEL)/* $(1)/; \
 	fi
-- 
cgit v1.2.3


From 72f68d67636b10b587e1bac0690ebb137cde5b4b Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 13 Jun 2006 23:33:21 +0000
Subject: remove libgcc hack

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3943 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 23152c11d..5e51b7e65 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -34,7 +34,7 @@ endef
 define Package/libgcc
  SECTION:=libs
  CATEGORY:=Libraries
- DEFAULT:=m, y if GCC_VERSION_4_0_2 || GCC_VERSION_4_0_3 || GCC_VERSION_4_1_0
+ DEFAULT:=y
  TITLE:=GCC support library
  VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
  DESCRIPTION:=$(TITLE)
-- 
cgit v1.2.3


From 7f7c42abe9f3e10915c8309ce4a57e8587fb66f4 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 18 Jun 2006 13:38:23 +0000
Subject: add conffiles for base-files

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3986 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 5e51b7e65..c790efeab 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -31,6 +31,48 @@ define Package/base-files$(TARGET)
  VERSION:=$(PKG_RELEASE)
 endef
 
+define -ar7-2.4/conffiles
+/etc/config/network
+endef
+
+define -aruba-2.6/conffiles
+/etc/config/network
+endef
+
+define -au1000-2.6/conffiles
+/etc/config/network
+endef
+
+define -rb532-2.6/conffiles
+/etc/config/network
+endef
+
+define -sibyte-2.6/conffiles
+/etc/config/network
+endef
+
+define -x86-2.6/conffiles
+/etc/config/network
+endef
+
+define -xscale-2.6/conffiles
+/etc/config/network
+endef
+
+
+define Package/base-files$(TARGET)/conffiles
+/etc/banner
+/etc/hosts
+/etc/inittab
+/etc/group
+/etc/passwd
+/etc/profile
+/etc/shells
+/etc/ipkg.conf
+/etc/sysctl.conf
+$(call $(TARGET)/conffiles)
+endef
+
 define Package/libgcc
  SECTION:=libs
  CATEGORY:=Libraries
-- 
cgit v1.2.3


From 4e00d98efdec5bb2e6e19eccf85fcf9a0eecb646 Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 18 Jun 2006 18:30:40 +0000
Subject: normalize Makefiles.

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3998 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index c790efeab..ec3dc8892 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -23,12 +23,12 @@ endif
 CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files)
 
 define Package/base-files$(TARGET)
- SECTION:=base
- CATEGORY:=Base system
- DEFAULT:=y
- TITLE:=OpenWrt system scripts
- DESCRIPTION:=Base filesystem for OpenWrt
- VERSION:=$(PKG_RELEASE)
+SECTION:=base
+CATEGORY:=Base system
+DEFAULT:=y
+TITLE:=OpenWrt system scripts
+DESCRIPTION:=Base filesystem for OpenWrt
+VERSION:=$(PKG_RELEASE)
 endef
 
 define -ar7-2.4/conffiles
@@ -74,19 +74,19 @@ $(call $(TARGET)/conffiles)
 endef
 
 define Package/libgcc
- SECTION:=libs
- CATEGORY:=Libraries
- DEFAULT:=y
- TITLE:=GCC support library
- VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
- DESCRIPTION:=$(TITLE)
+SECTION:=libs
+CATEGORY:=Libraries
+DEFAULT:=y
+TITLE:=GCC support library
+VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
+DESCRIPTION:=$(TITLE)
 endef
 
 define Package/uclibc
- $(call Package/base-files$(TARGET))
- VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
- TITLE:=C library
- DESCRIPTION:=C library for embedded systems
+$(call Package/base-files$(TARGET))
+VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
+TITLE:=C library
+DESCRIPTION:=C library for embedded systems
 endef
 
 define Build/Prepare
-- 
cgit v1.2.3


From 859e8f7f7d8bfbefd610d338d16498190cd51e15 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 21 Jun 2006 02:16:37 +0000
Subject: build system cleanup. move shared include files into
 $(TOPDIR)/include, move lzma, mkfs.* into toolchain/

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4032 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index ec3dc8892..bb2089409 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -1,7 +1,7 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
-include $(TOPDIR)/package/kernel.mk
+include $(TOPDIR)/include/kernel.mk
 
 PKG_NAME:=base-files
 PKG_RELEASE:=8
@@ -12,7 +12,7 @@ ifeq ($(REV),)
 REV:=0
 endif
 
-include $(TOPDIR)/package/rules.mk
+include $(TOPDIR)/include/package.mk
 
 ifneq ($(DUMP),1)
 TARGET:=-$(BOARD)-$(KERNEL)
-- 
cgit v1.2.3


From 0b0afa4d818ec18187b09055fbb8d84a01590d6e Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 21 Jun 2006 02:32:39 +0000
Subject: add INCLUDE_DIR variable for $(TOPDIR)/include

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4033 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index bb2089409..7db0d0503 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -1,7 +1,7 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
-include $(TOPDIR)/include/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
 PKG_RELEASE:=8
@@ -12,7 +12,7 @@ ifeq ($(REV),)
 REV:=0
 endif
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 ifneq ($(DUMP),1)
 TARGET:=-$(BOARD)-$(KERNEL)
-- 
cgit v1.2.3


From 9dfcb239f2c42e3a9ef3eef0d675848be949ecf6 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 23 Jun 2006 00:49:42 +0000
Subject: .pkginfo cleanup #2

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4053 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 7db0d0503..f81c681c2 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -18,6 +18,9 @@ ifneq ($(DUMP),1)
 TARGET:=-$(BOARD)-$(KERNEL)
 UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version}
 LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version}
+else
+UCLIBC_VERSION:=<UCLIBC_VERSION>
+LIBGCC_VERSION:=<LIBGCC_VERSION>
 endif
 
 CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files)
-- 
cgit v1.2.3


From 02cdebbb91a33d8e24da1c94a9d93ac39be168a7 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 27 Jun 2006 00:35:46 +0000
Subject: credit where credit is due

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4091 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index f81c681c2..b0fd72c76 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -1,3 +1,9 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 # $Id$
 
 include $(TOPDIR)/rules.mk
-- 
cgit v1.2.3


From 48e7e69b2a42338442f218166ae93db78221ff43 Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 2 Jul 2006 13:36:54 +0000
Subject: move libpthread in since it's part of uclibc, standardize Makefile.

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4105 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 64 ++++++++++++++++++++++++++++-----------------
 1 file changed, 40 insertions(+), 24 deletions(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index b0fd72c76..376bd5334 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -32,12 +32,12 @@ endif
 CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files)
 
 define Package/base-files$(TARGET)
-SECTION:=base
-CATEGORY:=Base system
-DEFAULT:=y
-TITLE:=OpenWrt system scripts
-DESCRIPTION:=Base filesystem for OpenWrt
-VERSION:=$(PKG_RELEASE)
+  SECTION:=base
+  CATEGORY:=Base system
+  DEFAULT:=y
+  TITLE:=OpenWrt system scripts
+  DESCRIPTION:=Base filesystem for OpenWrt
+  VERSION:=$(PKG_RELEASE)
 endef
 
 define -ar7-2.4/conffiles
@@ -83,19 +83,28 @@ $(call $(TARGET)/conffiles)
 endef
 
 define Package/libgcc
-SECTION:=libs
-CATEGORY:=Libraries
-DEFAULT:=y
-TITLE:=GCC support library
-VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
-DESCRIPTION:=$(TITLE)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  DEFAULT:=y
+  TITLE:=GCC support library
+  VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
+  DESCRIPTION:=$(TITLE)
 endef
 
+define Package/libpthread
+  $(call Package/base-files$(TARGET))
+  DEFAULT:=n
+  VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
+  TITLE:=POSIX thread library
+  DESCRIPTION:=POSIX thread library
+endef
+
+
 define Package/uclibc
-$(call Package/base-files$(TARGET))
-VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
-TITLE:=C library
-DESCRIPTION:=C library for embedded systems
+  $(call Package/base-files$(TARGET))
+  VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
+  TITLE:=C library
+  DESCRIPTION:=C library for embedded systems
 endef
 
 define Build/Prepare
@@ -112,7 +121,7 @@ define Build/Compile/brcm
 endef
 
 define Build/Compile
-$(call Build/Compile/$(BOARD))
+  $(call Build/Compile/$(BOARD))
 endef
 
 
@@ -126,7 +135,7 @@ define Package/base-files$(TARGET)/install-brcm
 endef
 
 define Package/base-files$(TARGET)/install
-$(call Package/base-files$(TARGET)/install-$(BOARD),$(1))
+  $(call Package/base-files$(TARGET)/install-$(BOARD),$(1))
 	$(CP) ./default/* $(1)/
 	if [ -d $(BOARD)-$(KERNEL) ]; then \
 		$(CP) $(BOARD)-$(KERNEL)/* $(1)/; \
@@ -151,19 +160,26 @@ $(call Package/base-files$(TARGET)/install-$(BOARD),$(1))
 	mkdir -p $(1)/etc
 endef
 
+define Package/libgcc/install
+	install -m0755 -d $(1)/lib
+	$(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(1)/lib/
+endef
+
+define Package/libpthread/install
+	install -m0755 -d $(1)/lib
+	$(CP) $(STAGING_DIR)/lib/libpthread.so.* $(1)/lib/
+	$(CP) $(STAGING_DIR)/lib/libpthread-$(UCLIBC_VERSION).so $(1)/lib/
+endef
+
 define Package/uclibc/install
-	mkdir -p $(1)/lib
+	install -m0755 -d $(1)/lib
 	for file in ld-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \
 		$(CP) $(STAGING_DIR)/lib/$$$$file.so.* $(1)/lib/; \
 		$(CP) $(STAGING_DIR)/lib/$$$$file-$(UCLIBC_VERSION).so $(1)/lib/; \
 	done
 endef
 
-define Package/libgcc/install
-	mkdir -p $(1)/lib
-	$(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(1)/lib/
-endef
-
 $(eval $(call BuildPackage,base-files$(TARGET)))
 $(eval $(call BuildPackage,libgcc))
+$(eval $(call BuildPackage,libpthread))
 $(eval $(call BuildPackage,uclibc))
-- 
cgit v1.2.3


From e9437d222f86a8960af081199fbef41312c7770b Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 10 Jul 2006 21:17:45 +0000
Subject: add a new FORCEREBUILD option to Package/<name> to force a package to
 be rebuilt each time make is run

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4123 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 376bd5334..daa15d0a7 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -38,6 +38,7 @@ define Package/base-files$(TARGET)
   TITLE:=OpenWrt system scripts
   DESCRIPTION:=Base filesystem for OpenWrt
   VERSION:=$(PKG_RELEASE)
+  FORCEREBUILD:=y
 endef
 
 define -ar7-2.4/conffiles
@@ -89,6 +90,7 @@ define Package/libgcc
   TITLE:=GCC support library
   VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
   DESCRIPTION:=$(TITLE)
+  FORCEREBUILD:=n
 endef
 
 define Package/libpthread
@@ -97,6 +99,7 @@ define Package/libpthread
   VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
   TITLE:=POSIX thread library
   DESCRIPTION:=POSIX thread library
+  FORCEREBUILD:=n
 endef
 
 
@@ -105,6 +108,7 @@ define Package/uclibc
   VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
   TITLE:=C library
   DESCRIPTION:=C library for embedded systems
+  FORCEREBUILD:=n
 endef
 
 define Build/Prepare
-- 
cgit v1.2.3


From bbeb64c6e9dd873211bb521f79907f3f16a184dc Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 10 Jul 2006 23:21:56 +0000
Subject: cleanup of [4123]

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4125 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index daa15d0a7..8fccf79ea 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -37,8 +37,7 @@ define Package/base-files$(TARGET)
   DEFAULT:=y
   TITLE:=OpenWrt system scripts
   DESCRIPTION:=Base filesystem for OpenWrt
-  VERSION:=$(PKG_RELEASE)
-  FORCEREBUILD:=y
+  VERSION:=$(PKG_RELEASE)-$(REV)
 endef
 
 define -ar7-2.4/conffiles
@@ -90,7 +89,6 @@ define Package/libgcc
   TITLE:=GCC support library
   VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
   DESCRIPTION:=$(TITLE)
-  FORCEREBUILD:=n
 endef
 
 define Package/libpthread
@@ -99,7 +97,6 @@ define Package/libpthread
   VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
   TITLE:=POSIX thread library
   DESCRIPTION:=POSIX thread library
-  FORCEREBUILD:=n
 endef
 
 
@@ -108,7 +105,6 @@ define Package/uclibc
   VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
   TITLE:=C library
   DESCRIPTION:=C library for embedded systems
-  FORCEREBUILD:=n
 endef
 
 define Build/Prepare
-- 
cgit v1.2.3


From 37ba07b32c887726aeffa54fb6d3af8665402b25 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 25 Jul 2006 18:12:30 +0000
Subject: use 127.0.0.1 as dns server and point dnsmasq to /tmp/resolv.conf

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4282 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 8fccf79ea..01ea9674c 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -153,7 +153,6 @@ define Package/base-files$(TARGET)/install
 	mkdir -p $(1)/usr/bin
 	mkdir -p $(1)/sys
 	mkdir -p $(1)/www
-	ln -sf /tmp/resolv.conf $(1)/etc/resolv.conf
 	ln -sf /proc/mounts $(1)/etc/mtab
 	rm -f $(1)/var
 	ln -sf /tmp $(1)/var
-- 
cgit v1.2.3


From 432ce85854aea17f9383519db1c2d3a8307c0760 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 29 Jul 2006 11:30:06 +0000
Subject: add support for per-package prereq checks, run global prereq checks
 before (menu-)config

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4318 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 01ea9674c..e41e1fd79 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -22,8 +22,8 @@ include $(INCLUDE_DIR)/package.mk
 
 ifneq ($(DUMP),1)
 TARGET:=-$(BOARD)-$(KERNEL)
-UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version}
-LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version}
+UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version 2>/dev/null}
+LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version 2>/dev/null}
 else
 UCLIBC_VERSION:=<UCLIBC_VERSION>
 LIBGCC_VERSION:=<LIBGCC_VERSION>
-- 
cgit v1.2.3


From 20f30a63469d4bc8be940376bda17c8d68edbc12 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 10 Aug 2006 19:25:26 +0000
Subject: add secret option to use host's toolchain when native compiling

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4553 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index e41e1fd79..dce07fe50 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -86,6 +86,7 @@ define Package/libgcc
   SECTION:=libs
   CATEGORY:=Libraries
   DEFAULT:=y
+  DEPENDS:=@!NATIVE_TOOLCHAIN
   TITLE:=GCC support library
   VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
   DESCRIPTION:=$(TITLE)
@@ -94,6 +95,7 @@ endef
 define Package/libpthread
   $(call Package/base-files$(TARGET))
   DEFAULT:=n
+  DEPENDS:=@!NATIVE_TOOLCHAIN
   VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
   TITLE:=POSIX thread library
   DESCRIPTION:=POSIX thread library
@@ -103,6 +105,7 @@ endef
 define Package/uclibc
   $(call Package/base-files$(TARGET))
   VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
+  DEPENDS:=@!NATIVE_TOOLCHAIN
   TITLE:=C library
   DESCRIPTION:=C library for embedded systems
 endef
-- 
cgit v1.2.3


From 6c87a8b8776b202a6c6eb913b8dbea80654e30dc Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 4 Sep 2006 23:51:30 +0000
Subject: remove default network config for brcm

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4752 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index dce07fe50..d6e62b5ae 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -133,6 +133,7 @@ define Package/base-files$(TARGET)/install-ar7
 	$(CP) $(PKG_BUILD_DIR)/adam2patcher $(1)/sbin
 endef
 define Package/base-files$(TARGET)/install-brcm
+	rm -f $(1)/etc/config/network
 	mkdir -p $(1)/sbin
 	$(CP) $(PKG_BUILD_DIR)/jffs2root $(1)/sbin
 endef
-- 
cgit v1.2.3


From 8afb23270d23db6a033ba8fb77e1cf1a1d925a7c Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 24 Sep 2006 20:49:31 +0000
Subject: new (last?) attempt at standardizing Makefiles

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4855 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 47 ++++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index d6e62b5ae..1e234c65a 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -11,22 +11,23 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
 PKG_RELEASE:=8
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/base-files
+
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
 
 REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
 ifeq ($(REV),)
-REV:=0
+  REV:=0
 endif
 
 include $(INCLUDE_DIR)/package.mk
 
 ifneq ($(DUMP),1)
-TARGET:=-$(BOARD)-$(KERNEL)
-UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version 2>/dev/null}
-LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version 2>/dev/null}
+  TARGET:=-$(BOARD)-$(KERNEL)
+  UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version 2>/dev/null}
+  LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version 2>/dev/null}
 else
-UCLIBC_VERSION:=<UCLIBC_VERSION>
-LIBGCC_VERSION:=<LIBGCC_VERSION>
+  UCLIBC_VERSION:=<UCLIBC_VERSION>
+  LIBGCC_VERSION:=<LIBGCC_VERSION>
 endif
 
 CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files)
@@ -35,8 +36,10 @@ define Package/base-files$(TARGET)
   SECTION:=base
   CATEGORY:=Base system
   DEFAULT:=y
-  TITLE:=OpenWrt system scripts
-  DESCRIPTION:=Base filesystem for OpenWrt
+  TITLE:=Base filesystem for OpenWrt
+  DESCRIPTION:=\
+	This package contains a base filesystem and system scripts for OpenWrt.
+  URL:=http://openwrt.org/
   VERSION:=$(PKG_RELEASE)-$(REV)
 endef
 
@@ -68,7 +71,6 @@ define -xscale-2.6/conffiles
 /etc/config/network
 endef
 
-
 define Package/base-files$(TARGET)/conffiles
 /etc/banner
 /etc/hosts
@@ -84,37 +86,37 @@ endef
 
 define Package/libgcc
   SECTION:=libs
-  CATEGORY:=Libraries
+  CATEGORY:=Base system
   DEFAULT:=y
   DEPENDS:=@!NATIVE_TOOLCHAIN
   TITLE:=GCC support library
+  URL:=http://gcc.gnu.org/
   VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
-  DESCRIPTION:=$(TITLE)
 endef
 
 define Package/libpthread
-  $(call Package/base-files$(TARGET))
-  DEFAULT:=n
+  SECTION:=libs
+  CATEGORY:=Libraries
   DEPENDS:=@!NATIVE_TOOLCHAIN
-  VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
   TITLE:=POSIX thread library
-  DESCRIPTION:=POSIX thread library
+  URL:=http://uclibc.org/
+  VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
 endef
 
-
 define Package/uclibc
-  $(call Package/base-files$(TARGET))
-  VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
+  SECTION:=libs
+  CATEGORY:=Base system
+  DEFAULT:=y
   DEPENDS:=@!NATIVE_TOOLCHAIN
-  TITLE:=C library
-  DESCRIPTION:=C library for embedded systems
+  TITLE:=C library embedded systems
+  URL:=http://uclibc.org/
+  VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
 endef
 
 define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)
 endef
 
-
 define Build/Compile/ar7
 	$(TARGET_CC) -o $(PKG_BUILD_DIR)/adam2patcher src/adam2patcher.c
 endef
@@ -132,6 +134,7 @@ define Package/base-files$(TARGET)/install-ar7
 	mkdir -p $(1)/sbin
 	$(CP) $(PKG_BUILD_DIR)/adam2patcher $(1)/sbin
 endef
+
 define Package/base-files$(TARGET)/install-brcm
 	rm -f $(1)/etc/config/network
 	mkdir -p $(1)/sbin
-- 
cgit v1.2.3


From 3cf72ac0abc8f9867cc374a63994358786b073a5 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 4 Oct 2006 20:03:26 +0000
Subject: move arch specific base-files install call to the end of the generic
 one - fixes wrong /etc/config/network

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4914 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/base-files/Makefile')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 1e234c65a..9f6da3bc7 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -142,7 +142,6 @@ define Package/base-files$(TARGET)/install-brcm
 endef
 
 define Package/base-files$(TARGET)/install
-  $(call Package/base-files$(TARGET)/install-$(BOARD),$(1))
 	$(CP) ./default/* $(1)/
 	if [ -d $(BOARD)-$(KERNEL) ]; then \
 		$(CP) $(BOARD)-$(KERNEL)/* $(1)/; \
@@ -164,6 +163,7 @@ define Package/base-files$(TARGET)/install
 	rm -f $(1)/var
 	ln -sf /tmp $(1)/var
 	mkdir -p $(1)/etc
+$(call Package/base-files$(TARGET)/install-$(BOARD),$(1))
 endef
 
 define Package/libgcc/install
-- 
cgit v1.2.3