X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/50dcf5b0d071e212c11083beb38005194387d4e8..5ad62fbdd3e65c841a917ee5f2d1fc238921078c:/package/base-files/Makefile

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 869e3c67d..14917f683 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -1,91 +1,154 @@
+# 
+# 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
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=4
-PKG_BUILD_DIR:=$(BUILD_DIR)/base-files
+PKG_RELEASE:=8
 
-REV:=${shell svn info | grep Revision | cut -d ' ' -f 2}
+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 $(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)
-	$(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
-	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/; \
+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}
+else
+  UCLIBC_VERSION:=<UCLIBC_VERSION>
+  LIBGCC_VERSION:=<LIBGCC_VERSION>
+endif
+
+CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files)
+
+define Package/base-files$(TARGET)
+  SECTION:=base
+  CATEGORY:=Base system
+  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
+
+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:=Base system
+  DEPENDS:=@!NATIVE_TOOLCHAIN
+  TITLE:=GCC support library
+  URL:=http://gcc.gnu.org/
+  VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
+endef
+
+define Package/libpthread
+  SECTION:=libs
+  CATEGORY:=Libraries
+  DEPENDS:=@!NATIVE_TOOLCHAIN
+  TITLE:=POSIX thread library
+  URL:=http://uclibc.org/
+  VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
+endef
+
+define Package/uclibc
+  SECTION:=libs
+  CATEGORY:=Base system
+  DEPENDS:=@!NATIVE_TOOLCHAIN
+  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/Default
+endef
+
+define Build/Compile
+	$(call Build/Compile/Default)
+endef
+
+define Package/base-files$(TARGET)/install
+	$(CP) ./files/* $(1)/
+	if [ -d $(PLATFORM_DIR)/base-files/. ]; then \
+		$(CP) $(PLATFORM_DIR)/base-files/* $(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
+	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 /proc/mounts $(1)/etc/mtab
+	rm -f $(1)/var
+	ln -sf /tmp $(1)/var
+	mkdir -p $(1)/etc
+	ln -sf /tmp/resolv.conf $(1)/etc/resolv.conf
+	$(call Package/base-files/install-target,$(1))
+	for conffile in $(1)/etc/config/*; do \
+		if [ -f "$$$$conffile" ]; then \
+			grep "$$$$conffile" $(1)/CONTROL/conffiles || \
+				echo "$$$${conffile##$(1)}" >> $(1)/CONTROL/conffiles; \
+		fi \
+	done
+endef
+
+define Package/libgcc/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(1)/lib/
+endef
+
+define Package/libpthread/install
+	$(INSTALL_DIR) $(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
+	$(INSTALL_DIR) $(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-targets: package-clean
-prepare:
-compile-targets: $(PACKAGES)
-install-targets: compile
-	mkdir -p $(TARGET_DIR)
-	$(IPKG) install $(PACKAGES)
+endef
+
+ifneq ($(DUMP),1)
+  -include $(PLATFORM_DIR)/base-files.mk
+endif
+
+$(eval $(call BuildPackage,base-files$(TARGET)))
+$(eval $(call BuildPackage,libgcc))
+$(eval $(call BuildPackage,libpthread))
+$(eval $(call BuildPackage,uclibc))