mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
build system cleanup/restructuring as described in http://lists.openwrt.org/pipermail/openwrt-devel/2007-August/001159.html
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8362 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -17,23 +17,23 @@ $(curdir)/builddirs-install:=. $(sort $(package-y))
|
||||
$(curdir)/install:=$(curdir)/install-cleanup
|
||||
|
||||
$(curdir)/cleanup: $(TMP_DIR)/.build
|
||||
rm -rf $(BUILD_DIR)/root
|
||||
rm -rf $(TARGET_DIR)
|
||||
|
||||
$(curdir)/rootfs-prepare: $(TMP_DIR)/.build
|
||||
@if [ -d $(TOPDIR)/files ]; then \
|
||||
$(CP) $(TOPDIR)/files/. $(BUILD_DIR)/root; \
|
||||
$(CP) $(TOPDIR)/files/. $(TARGET_DIR); \
|
||||
fi
|
||||
@mkdir -p $(BUILD_DIR)/root/etc/rc.d
|
||||
@mkdir -p $(TARGET_DIR)/etc/rc.d
|
||||
@( \
|
||||
cd $(BUILD_DIR)/root; \
|
||||
cd $(TARGET_DIR); \
|
||||
for script in ./etc/init.d/*; do \
|
||||
grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \
|
||||
IPKG_INSTROOT=$(BUILD_DIR)/root $(which bash) ./etc/rc.common $$script enable; \
|
||||
IPKG_INSTROOT=$(TARGET_DIR) $(which bash) ./etc/rc.common $$script enable; \
|
||||
done || true \
|
||||
)
|
||||
@-find $(BUILD_DIR)/root -name CVS | $(XARGS) rm -rf
|
||||
@-find $(BUILD_DIR)/root -name .svn | $(XARGS) rm -rf
|
||||
@-find $(BUILD_DIR)/root -name '.#*' | $(XARGS) rm -f
|
||||
@-find $(TARGET_DIR) -name CVS | $(XARGS) rm -rf
|
||||
@-find $(TARGET_DIR) -name .svn | $(XARGS) rm -rf
|
||||
@-find $(TARGET_DIR) -name '.#*' | $(XARGS) rm -f
|
||||
|
||||
$(curdir)/index: FORCE
|
||||
@(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages)
|
||||
|
||||
@@ -23,9 +23,7 @@ include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
ifneq ($(DUMP),1)
|
||||
TARGET:=-$(BOARD)-$(KERNEL)
|
||||
UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version 2>/dev/null}
|
||||
UCLIBC_EXTRA_VERSION:=${shell cat $(STAGING_DIR)/uclibc_extra_version 2>/dev/null}
|
||||
LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version 2>/dev/null}
|
||||
LIBGCC_VERSION:=$(GCC_VERSION)
|
||||
else
|
||||
UCLIBC_VERSION:=<UCLIBC_VERSION>
|
||||
LIBGCC_VERSION:=<LIBGCC_VERSION>
|
||||
@@ -92,7 +90,7 @@ define Package/uclibc/Default
|
||||
CATEGORY:=Base system
|
||||
DEPENDS:=@!NATIVE_TOOLCHAIN
|
||||
URL:=http://uclibc.org/
|
||||
VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
|
||||
VERSION:=$(UCLIBC_VERSION)$(UCLIBC_PATCHVER)-$(PKG_RELEASE)
|
||||
endef
|
||||
|
||||
define Package/libpthread
|
||||
@@ -158,43 +156,43 @@ endef
|
||||
|
||||
define Package/libgcc/install
|
||||
$(INSTALL_DIR) $(1)/lib
|
||||
$(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(1)/lib/
|
||||
$(CP) $(TOOLCHAIN_DIR)/lib/libgcc_s.so.* $(1)/lib/
|
||||
endef
|
||||
|
||||
ifeq ($(word 1,$(subst ., ,$(LIBGCC_VERSION))),4)
|
||||
define Package/libssp/install
|
||||
$(INSTALL_DIR) $(1)/lib
|
||||
$(CP) $(STAGING_DIR)/lib/libssp.so.* $(1)/lib/
|
||||
$(CP) $(TOOLCHAIN_DIR)/lib/libssp.so.* $(1)/lib/
|
||||
endef
|
||||
endif
|
||||
|
||||
define Package/libstdcpp/install
|
||||
$(INSTALL_DIR) $(1)/lib
|
||||
$(CP) $(STAGING_DIR)/lib/libstdc++.so.* $(1)/lib/
|
||||
$(CP) $(TOOLCHAIN_DIR)/lib/libstdc++.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/
|
||||
$(CP) $(TOOLCHAIN_DIR)/lib/libpthread.so.* $(1)/lib/
|
||||
$(CP) $(TOOLCHAIN_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/; \
|
||||
$(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(1)/lib/; \
|
||||
$(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(UCLIBC_VERSION).so $(1)/lib/; \
|
||||
done
|
||||
endef
|
||||
|
||||
define Package/ldd/install
|
||||
$(INSTALL_DIR) $(1)/bin/
|
||||
$(CP) $(TOOLCHAIN_BUILD_DIR)/uClibc-$(UCLIBC_EXTRA_VERSION)/utils/ldd $(1)/bin/
|
||||
$(CP) $(TOOLCHAIN_DIR)/utils/ldd $(1)/bin/
|
||||
endef
|
||||
|
||||
define Package/ldconfig/install
|
||||
$(INSTALL_DIR) $(1)/bin/
|
||||
$(CP) $(TOOLCHAIN_BUILD_DIR)/uClibc-$(UCLIBC_EXTRA_VERSION)/utils/ldconfig $(1)/bin/
|
||||
$(CP) $(TOOLCHAIN_DIR)/utils/ldconfig $(1)/bin/
|
||||
endef
|
||||
|
||||
ifneq ($(DUMP),1)
|
||||
|
||||
@@ -18,6 +18,7 @@ PKG_MD5SUM:=9b7dc52656f5cbec846a7ba3299f73bd
|
||||
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/bridge-utils-$(PKG_VERSION)
|
||||
|
||||
include $(INCLUDE_DIR)/kernel.mk
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/bridge
|
||||
|
||||
Reference in New Issue
Block a user