X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/d37c5c518e40e35a4b21281c86de7ba2ab1df439..34d342e6d4f3455204b3d189ad093e6c7eb2361d:/package/base-files/Makefile

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 9cca04a73..252fa7eba 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -3,82 +3,92 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=2
+PKG_RELEASE:=7
 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
+endif
+
 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
-
-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) $(IPKG_HOTPLUG)
-
-$(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)
-	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
-	-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_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/; \
+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.* $(1)/lib/; \
+		$(CP) $(STAGING_DIR)/lib/$$file-$(UCLIBC_VERSION).so $(1)/lib/; \
 	done
-	-$(STRIP) $(IDIR_LIBC)/lib/*
-	$(IPKG_BUILD) $(IDIR_LIBC) $(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_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
-prepare:
-compile: $(PACKAGES)
-install: compile
-	mkdir -p $(TARGET_DIR)
-	$(IPKG) install $(PACKAGES)
+endef
+
+define Package/libgcc/install
+	mkdir -p $(IDIR_LIBGCC)/lib
+	$(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(IDIR_LIBGCC)/lib/
+endef
+
+$(eval $(call BuildPackage,base-files))
+$(eval $(call BuildPackage,libgcc))
+$(eval $(call BuildPackage,uclibc))