- install some more stuff that goes into staging_dir into the proper place. (41decaa9) · Commits · Dom Sekotill / buildroot

package/bash/bash.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@ $(BASH_DIR)/$(BASH_BINARY): $(BASH_DIR)/.configured
		$(TARGET_DIR)/$(BASH_TARGET_BINARY): $(BASH_DIR)/$(BASH_BINARY)
		$(MAKE1) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BASH_DIR) install
		rm -f $(TARGET_DIR)/bin/bash*
		-mkdir $(TARGET_DIR)/bin
		mv $(TARGET_DIR)/usr/bin/bash* $(TARGET_DIR)/bin/
		(cd $(TARGET_DIR)/bin; /bin/ln -fs bash sh)
		rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \

package/libelf/libelf.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ $(LIBELF_DIR)/.configured: $(LIBELF_DIR)/.unpacked
		$(LIBELF_DIR)/lib/libelf.so.$(LIBELF_VER): $(LIBELF_DIR)/.configured
		$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(LIBELF_DIR)

		$(STAGING_DIR)/usr/lib/libelf.a: $(LIBELF_DIR)/lib/libelf.so.$(LIBELF_VER)
		$(STAGING_DIR)/usr/lib/libelf.a $(STAGING_DIR)/usr/lib/libelf.so.$(LIBELF_VER): $(LIBELF_DIR)/lib/libelf.so.$(LIBELF_VER)
		$(MAKE1) $(TARGET_CONFIGURE_OPTS) \
		instroot=$(STAGING_DIR) -C $(LIBELF_DIR) install

package/libsysfs/libsysfs.mk

+13 −9

Original line number	Diff line number	Diff line
		@@ -34,10 +34,11 @@ libsysfs-source: $(DL_DIR)/$(LIBSYSFS_SOURCE)

		$(LIBSYSFS_DIR)/.unpacked: $(DL_DIR)/$(LIBSYSFS_SOURCE)
		$(LIBSYSFS_CAT) $(DL_DIR)/$(LIBSYSFS_SOURCE) \| tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
		touch $(LIBSYSFS_DIR)/.unpacked
		$(CONFIG_UPDATE) $(@D)
		touch $@

		$(LIBSYSFS_DIR)/.configured: $(LIBSYSFS_DIR)/.unpacked
		(cd $(LIBSYSFS_DIR); \
		(cd $(LIBSYSFS_DIR); rm -rf config.cache ; \
		$(TARGET_CONFIGURE_OPTS) \
		CFLAGS="$(TARGET_CFLAGS) " \
		LDFLAGS="$(TARGET_LDFLAGS)" \
		@@ -45,25 +46,28 @@ $(LIBSYSFS_DIR)/.configured: $(LIBSYSFS_DIR)/.unpacked
		--target=$(GNU_TARGET_NAME) \
		--host=$(GNU_TARGET_NAME) \
		--build=$(GNU_HOST_NAME) \
		--prefix=/ );
		touch $(LIBSYSFS_DIR)/.configured
		--prefix=/usr \
		--sysconfdir=/etc \
		);
		touch $@

		$(LIBSYSFS_DIR)/.compiled: $(LIBSYSFS_DIR)/.configured
		$(MAKE) -C $(LIBSYSFS_DIR)
		touch $(LIBSYSFS_DIR)/.compiled
		touch $@

		$(STAGING_DIR)/lib/libsysfs.so: $(LIBSYSFS_DIR)/.compiled
		$(STAGING_DIR)/usr/lib/libsysfs.so: $(LIBSYSFS_DIR)/.compiled
		$(MAKE) -C $(LIBSYSFS_DIR) DESTDIR=$(STAGING_DIR) install
		touch -c $(STAGING_DIR)/lib/libsysfs.so
		touch -c $@

		$(TARGET_DIR)/usr/lib/libsysfs.so: $(STAGING_DIR)/lib/libsysfs.so
		cp -dpf $(STAGING_DIR)/lib/libsysfs.so* $(TARGET_DIR)/usr/lib/
		$(TARGET_DIR)/usr/lib/libsysfs.so: $(STAGING_DIR)/usr/lib/libsysfs.so
		cp -dpf $(STAGING_DIR)/usr/lib/libsysfs.so* $(TARGET_DIR)/usr/lib/
		-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libsysfs.so

		libsysfs: uclibc $(TARGET_DIR)/usr/lib/libsysfs.so

		libsysfs-clean:
		-$(MAKE) -C $(LIBSYSFS_DIR) clean
		-$(MAKE) -C $(LIBSYSFS_DIR) DESTDIR=$(STAGING_DIR) uninstall
		rm -f $(TARGET_DIR)/usr/lib/libsysfs.so*

		libsysfs-dirclean:

package/ltrace/ltrace.mk

+25 −12

Original line number	Diff line number	Diff line
		@@ -3,14 +3,15 @@
		# ltrace
		#
		#############################################################
		LTRACE_SOURCE=ltrace_0.3.36.orig.tar.gz
		LTRACE_SOURCE2=ltrace_0.3.36-2.diff.gz
		LTRACE_VERSION=0.4
		LTRACE_SOURCE=ltrace_$(LTRACE_VERSION).orig.tar.gz
		#LTRACE_PATCH=ltrace_$(LTRACE_VERSION)-1.diff.gz
		LTRACE_SITE=http://ftp.debian.org/debian/pool/main/l/ltrace
		LTRACE_DIR=$(BUILD_DIR)/ltrace-0.3.36
		LTRACE_DIR=$(BUILD_DIR)/ltrace-$(LTRACE_VERSION)
		LTRACE_BINARY=ltrace
		LTRACE_TARGET_BINARY=usr/bin/ltrace

		LTRACE_ARCH:=$(ARCH)
		LTRACE_ARCH:=$(KERNEL_ARCH)
		ifeq ("$(strip $(ARCH))","armeb")
		LTRACE_ARCH:=arm
		endif
		@@ -18,15 +19,26 @@ endif
		$(DL_DIR)/$(LTRACE_SOURCE):
		$(WGET) -P $(DL_DIR) $(LTRACE_SITE)/$(LTRACE_SOURCE)

		$(DL_DIR)/$(LTRACE_SOURCE2):
		$(WGET) -P $(DL_DIR) $(LTRACE_SITE)/$(LTRACE_SOURCE2)
		ifneq ($(LTRACE_PATCH),)
		LTRACE_SOURCE2:=$(DL_DIR)/$(LTRACE_PATCH)
		$(LTRACE_SOURCE2):
		$(WGET) -P $(DL_DIR) $(LTRACE_SITE)/$(LTRACE_PATCH)

		$(LTRACE_DIR)/.source: $(DL_DIR)/$(LTRACE_SOURCE) $(DL_DIR)/$(LTRACE_SOURCE2)
		else
		LTRACE_SOURCE2:=
		endif

		$(LTRACE_DIR)/.patched: $(DL_DIR)/$(LTRACE_SOURCE) $(LTRACE_SOURCE2)
		$(ZCAT) $(DL_DIR)/$(LTRACE_SOURCE) \| tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
		$(ZCAT) $(DL_DIR)/$(LTRACE_SOURCE2) \| patch -p1 -d $(LTRACE_DIR)
		touch $(LTRACE_DIR)/.source
		ifneq ($(LTRACE_PATCH),)
		$(ZCAT) $(LTRACE_SOURCE2) \| patch -p1 -d $(LTRACE_DIR)
		endif
		toolchain/patch-kernel.sh $(LTRACE_DIR) package/ltrace ltrace\*.patch
		$(CONFIG_UPDATE) $(@D)
		chmod +x $(LTRACE_DIR)/configure
		touch $@

		$(LTRACE_DIR)/.configured: $(LTRACE_DIR)/.source
		$(LTRACE_DIR)/.configured: $(LTRACE_DIR)/.patched
		(cd $(LTRACE_DIR); \
		$(TARGET_CONFIGURE_OPTS) \
		CFLAGS="$(TARGET_CFLAGS)" \
		@@ -37,8 +49,9 @@ $(LTRACE_DIR)/.configured: $(LTRACE_DIR)/.source
		--build=$(GNU_HOST_NAME) \
		--prefix=/usr \
		--sysconfdir=/etc \
		$(DISABLE_LARGEFILE) \
		);
		touch $(LTRACE_DIR)/.configured;
		touch $@

		$(LTRACE_DIR)/$(LTRACE_BINARY): $(LTRACE_DIR)/.configured
		$(MAKE) CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld ARCH=$(LTRACE_ARCH) \
		@@ -51,7 +64,7 @@ $(TARGET_DIR)/$(LTRACE_TARGET_BINARY): $(LTRACE_DIR)/$(LTRACE_BINARY)

		ltrace: uclibc libelf $(TARGET_DIR)/$(LTRACE_TARGET_BINARY)

		ltrace-source: $(DL_DIR)/$(LTRACE_SOURCE)
		ltrace-source: $(DL_DIR)/$(LTRACE_SOURCE) $(LTRACE_SOURCE2)

		ltrace-clean:
		$(MAKE) prefix=$(TARGET_DIR)/usr -C $(LTRACE_DIR) uninstall

package/m4/m4.mk

+10 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		# m4
		#
		#############################################################
		M4_VER:=1.4.8
		M4_VER:=1.4.9
		M4_SOURCE:=m4-$(M4_VER).tar.bz2
		M4_CAT:=$(BZCAT)
		M4_SITE:=http://ftp.gnu.org/pub/gnu/m4
		@@ -11,6 +11,10 @@ M4_DIR:=$(BUILD_DIR)/m4-$(M4_VER)
		M4_BINARY:=m4
		M4_TARGET_BINARY:=usr/bin/m4

		ifeq ($(UCLIBC_HAS_REGEX),y)
		gl_cv_func_re_compile_pattern_working=gl_cv_func_re_compile_pattern_working=yes
		endif

		$(DL_DIR)/$(M4_SOURCE):
		$(WGET) -P $(DL_DIR) $(M4_SITE)/$(M4_SOURCE)

		@@ -18,6 +22,8 @@ m4-source: $(DL_DIR)/$(M4_SOURCE)

		$(M4_DIR)/.unpacked: $(DL_DIR)/$(M4_SOURCE)
		$(M4_CAT) $(DL_DIR)/$(M4_SOURCE) \| tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
		toolchain/patch-kernel.sh $(M4_DIR) package/m4 m4\*.patch
		$(CONFIG_UPDATE) $(@D)
		touch $(M4_DIR)/.unpacked

		$(M4_DIR)/.configured: $(M4_DIR)/.unpacked
		@@ -25,12 +31,15 @@ $(M4_DIR)/.configured: $(M4_DIR)/.unpacked
		$(TARGET_CONFIGURE_OPTS) \
		CFLAGS="$(TARGET_CFLAGS)" \
		LDFLAGS="$(TARGET_LDFLAGS)" \
		gl_cv_func_gettimeofday_clobber=no \
		$(gl_cv_func_re_compile_pattern_working) \
		./configure \
		--target=$(GNU_TARGET_NAME) \
		--host=$(GNU_TARGET_NAME) \
		--build=$(GNU_HOST_NAME) \
		--prefix=/usr \
		--exec-prefix=/usr \
		$(DISABLE_LARGEFILE) \
		);
		touch $(M4_DIR)/.configured