Merge a bunch of stuff over from the tuxscreen buildroot, with (7129da00) · Commits · Dom Sekotill / buildroot

make/ext2root.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ GENEXT2_REALSIZE=$(subst total,, $(shell du $(TARGET_DIR) -s -c -k \| grep total
		GENEXT2_SIZE=$(shell expr $(GENEXT2_REALSIZE) + $(GENEXT2_ADDTOROOTSIZE))
		# We currently add about 400 device nodes, so add that into the total
		GENEXT2_INODES=$(shell expr $(shell find $(TARGET_DIR) \| wc -l) + 400)
		#GENEXT2_SIZE=100000
		GENEXT2_SIZE=100000

		ext2root: genext2fs
		-@find $(TARGET_DIR)/lib -type f -name \.so\ \| xargs $(STRIP) --strip-unneeded 2>/dev/null \|\| true;

make/gcc_target.mk

+52 −14

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@
		# hacking on the toolchain...
		#
		#############################################################
		GNU_TARGET_NAME:=$(ARCH)-linux
		TARGET_LANGUAGES:=c,c++

		# If you want multilib enabled, enable this...
		@@ -52,21 +51,27 @@ $(BINUTILS_DIR2)/.configured:
		#(cd $(TARGET_DIR)/usr/$(GNU_TARGET_NAME); ln -fs ../lib)
		#(cd $(TARGET_DIR)/usr/$(GNU_TARGET_NAME); ln -fs ../include)
		(cd $(TARGET_DIR)/usr/$(GNU_TARGET_NAME); ln -fs ../include sys-include)
		(cd $(BINUTILS_DIR2); PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CROSS)gcc \
		(cd $(BINUTILS_DIR2); PATH=$(STAGING_DIR)/bin:$$PATH AR=$(TARGET_CROSS)ar \
		RANLIB=$(TARGET_CROSS)ranlib LD=$(TARGET_CROSS)ld NM=$(TARGET_CROSS)nm \
		CC=$(TARGET_CROSS)gcc \
		$(BINUTILS_DIR)/configure \
		--target=$(GNU_TARGET_NAME) \
		--prefix=/usr \
		--exec-prefix=/usr \
		--bindir=/usr/bin \
		--sbindir=/usr/sbin \
		--libexecdir=/usr/lib \
		--sysconfdir=/etc \
		--datadir=/usr/share \
		--includedir=/usr/include \
		--libdir=/usr/lib \
		--localstatedir=/var \
		--mandir=/usr/man \
		--infodir=/usr/info \
		--with-gxx-include-dir=/usr/include/c++ \
		--disable-shared $(MULTILIB) );
		--includedir=$(STAGING_DIR)/include \
		--with-gxx-include-dir=$(STAGING_DIR)/include/c++ \
		--disable-shared $(MULTILIB) \
		--program-prefix="" \
		);
		touch $(BINUTILS_DIR2)/.configured

		$(BINUTILS_DIR2)/binutils/objdump: $(BINUTILS_DIR2)/.configured
		@@ -75,7 +80,11 @@ $(BINUTILS_DIR2)/binutils/objdump: $(BINUTILS_DIR2)/.configured
		CC=$(TARGET_CROSS)gcc -C $(BINUTILS_DIR2)

		$(TARGET_DIR)/usr/bin/ld: $(BINUTILS_DIR2)/binutils/objdump
		PATH=$(STAGING_DIR)/bin:$$PATH $(MAKE) \
		PATH=$(STAGING_DIR)/bin:$$PATH CC=$(HOSTCC) GCC_FOR_TARGET=$(TARGET_CROSS)gcc \
		AR_FOR_TARGET=$(TARGET_CROSS)ar RANLIB_FOR_TARGET=$(TARGET_CROSS)ranlib \
		LD_FOR_TARGET=$(TARGET_CROSS)ld NM_FOR_TARGET=$(TARGET_CROSS)nm \
		CC_FOR_TARGET=$(TARGET_CROSS)gcc \
		$(MAKE) \
		prefix=$(TARGET_DIR)/usr \
		exec_prefix=$(TARGET_DIR)/usr \
		bindir=$(TARGET_DIR)/usr/bin \
		@@ -169,24 +178,53 @@ $(GCC_BUILD_DIR3)/.gcc_build_hacks:

		$(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.gcc_build_hacks
		(cd $(GCC_BUILD_DIR3); PATH=$(STAGING_DIR)/bin:$$PATH AR=$(TARGET_CROSS)ar \
		RANLIB=$(TARGET_CROSS)ranlib LD=$(TARGET_CROSS)ld CC=$(TARGET_CROSS)gcc \
		$(GCC_DIR)/configure \
		RANLIB=$(TARGET_CROSS)ranlib LD=$(TARGET_CROSS)ld NM=$(TARGET_CROSS)nm \
		CC=$(TARGET_CROSS)gcc $(GCC_DIR)/configure \
		--target=$(GNU_TARGET_NAME) \
		--prefix=$(TARGET_DIR)/usr \
		--exec-prefix=/usr \
		--bindir=/usr/bin \
		--sbindir=/usr/sbin \
		--libexecdir=/usr/lib \
		--sysconfdir=/etc \
		--datadir=/usr/share \
		--localstatedir=/var \
		--mandir=/usr/man \
		--infodir=/usr/info \
		--with-local-prefix=/usr/local \
		--libdir=/usr/lib \
		--includedir=$(STAGING_DIR)/include \
		--with-gxx-include-dir=$(STAGING_DIR)/include/c++ \
		--oldincludedir=$(STAGING_DIR)/include \
		--enable-shared $(MULTILIB) \
		--enable-target-optspace --disable-nls --with-gnu-ld \
		--enable-languages=$(TARGET_LANGUAGES) --disable-__cxa_atexit );
		--enable-target-optspace --disable-nls \
		--with-gnu-ld --disable-__cxa_atexit \
		--enable-languages=$(TARGET_LANGUAGES) \
		$(EXTRA_GCC_CONFIG_OPTIONS) \
		--program-prefix="" \
		);
		#$(GNU_TARGET_NAME) \
		#--target=$(GNU_TARGET_NAME) \
		#
		touch $(GCC_BUILD_DIR3)/.configured

		$(GCC_BUILD_DIR3)/.compiled: $(GCC_BUILD_DIR3)/.configured
		PATH=$(STAGING_DIR)/bin:$$PATH $(MAKE) AR=$(TARGET_CROSS)ar \
		RANLIB=$(TARGET_CROSS)ranlib LD=$(TARGET_CROSS)ld \
		CC=$(TARGET_CROSS)gcc -C $(GCC_BUILD_DIR3)
		PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CROSS)gcc \
		AR=$(TARGET_CROSS)ar RANLIB=$(TARGET_CROSS)ranlib \
		LD=$(TARGET_CROSS)ld NM=$(TARGET_CROSS)nm \
		AR_FOR_TARGET=$(TARGET_CROSS)ar RANLIB_FOR_TARGET=$(TARGET_CROSS)ranlib \
		LD_FOR_TARGET=$(TARGET_CROSS)ld NM_FOR_TARGET=$(TARGET_CROSS)nm \
		CC_FOR_TARGET=$(TARGET_CROSS)gcc LIBGCC2_INCLUDES=$(TARGET_DIR)/usr/include \
		$(MAKE) -C $(GCC_BUILD_DIR3)
		touch $(GCC_BUILD_DIR3)/.compiled

		$(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR3)/.compiled
		PATH=$(STAGING_DIR)/bin:$$PATH $(MAKE) \
		PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CROSS)gcc \
		AR=$(TARGET_CROSS)ar RANLIB=$(TARGET_CROSS)ranlib \
		LD=$(TARGET_CROSS)ld NM=$(TARGET_CROSS)nm \
		AR_FOR_TARGET=$(TARGET_CROSS)ar RANLIB_FOR_TARGET=$(TARGET_CROSS)ranlib \
		LD_FOR_TARGET=$(TARGET_CROSS)ld NM_FOR_TARGET=$(TARGET_CROSS)nm \
		CC_FOR_TARGET=$(TARGET_CROSS)gcc $(MAKE) \
		prefix=$(TARGET_DIR)/usr \
		exec_prefix=$(TARGET_DIR)/usr \
		bindir=$(TARGET_DIR)/usr/bin \

make/hotplug.mk

0 → 100644

+39 −0

Original line number	Diff line number	Diff line
		#############################################################
		#
		# hotplug support
		#
		#############################################################
		HOTPLUG_SOURCE=diethotplug-0.4.tar.gz
		HOTPLUG_SITE=http://telia.dl.sourceforge.net/sourceforge/linux-hotplug
		HOTPLUG_DIR=$(BUILD_DIR)/diethotplug-0.4
		HOTPLUG_PATCH=$(SOURCE_DIR)/hotplug.patch

		$(DL_DIR)/$(HOTPLUG_SOURCE):
		$(WGET) -P $(DL_DIR) $(HOTPLUG_SITE)/$(HOTPLUG_SOURCE)

		$(HOTPLUG_DIR): $(DL_DIR)/$(HOTPLUG_SOURCE) $(HOTPLUG_PATCH)
		zcat $(DL_DIR)/$(HOTPLUG_SOURCE) \| tar -C $(BUILD_DIR) -xvf -
		cat $(HOTPLUG_PATCH) \| patch -p1 -d $(HOTPLUG_DIR)

		$(HOTPLUG_DIR)/hotplug: $(HOTPLUG_DIR)
		$(MAKE) CROSS=$(TARGET_CROSS) DEBUG=false KLIBC=false \
		KERNEL_INCLUDE_DIR=$(STAGING_DIR)/include \
		TARGET_DIR=$(TARGET_DIR) -C $(HOTPLUG_DIR);
		$(STRIP) $(HOTPLUG_DIR)/hotplug;
		touch -c $(HOTPLUG_DIR)/hotplug

		$(TARGET_DIR)/sbin/hotplug: $(HOTPLUG_DIR)/hotplug
		cp $(HOTPLUG_DIR)/hotplug $(TARGET_DIR)/sbin/hotplug;
		touch -c $(TARGET_DIR)/sbin/hotplug

		hotplug: uclibc $(TARGET_DIR)/sbin/hotplug

		ext2root-source: $(DL_DIR)/$(HOTPLUG_SOURCE)

		hotplug-clean:
		rm -f $(TARGET_DIR)/sbin/hotplug
		-$(MAKE) -C $(HOTPLUG_DIR) clean

		hotplug-dirclean:
		rm -rf $(HOTPLUG_DIR)

make/jpeg.mk

0 → 100644

+68 −0

Original line number	Diff line number	Diff line
		#############################################################
		#
		# jpeg (libraries needed by some apps)
		#
		#############################################################
		# Copyright (C) 2001-2003 by Erik Andersen <andersen@codepoet.org>
		# Copyright (C) 2002 by Tim Riker <Tim@Rikers.org>
		#
		# This program is free software; you can redistribute it and/or modify
		# it under the terms of the GNU Library General Public License as
		# published by the Free Software Foundation; either version 2 of the
		# License, or (at your option) any later version.
		#
		# This program is distributed in the hope that it will be useful, but
		# WITHOUT ANY WARRANTY; without even the implied warranty of
		# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		# Library General Public License for more details.
		#
		# You should have received a copy of the GNU Library General Public
		# License along with this program; if not, write to the Free Software
		# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
		# USA
		JPEG_DIR=$(BUILD_DIR)/jpeg-6b
		JPEG_SITE:=ftp://ftp.uu.net/graphics/jpeg/
		JPEG_SOURCE=jpegsrc.v6b.tar.gz
		JPEG_CAT:=zcat

		$(DL_DIR)/$(JPEG_SOURCE):
		$(WGET) -P $(DL_DIR) $(JPEG_SITE)/$(JPEG_SOURCE)

		jpeg-source: $(DL_DIR)/$(JPEG_SOURCE)

		$(JPEG_DIR)/.unpacked: $(DL_DIR)/$(JPEG_SOURCE)
		$(JPEG_CAT) $(DL_DIR)/$(JPEG_SOURCE) \| tar -C $(BUILD_DIR) -xvf -
		touch $(JPEG_DIR)/.unpacked

		$(JPEG_DIR)/.configured: $(JPEG_DIR)/.unpacked
		zcat $(DL_DIR)/$(JPEG_SOURCE) \| tar -C $(BUILD_DIR) -xvf -
		(cd $(JPEG_DIR); rm -rf config.cache; \
		PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
		./configure \
		--target=$(GNU_TARGET_NAME) \
		--prefix=/usr \
		--exec-prefix=/usr \
		--bindir=/usr/bin \
		--sbindir=/usr/sbin \
		--libexecdir=/usr/lib \
		--sysconfdir=/etc \
		--datadir=/usr/share \
		--localstatedir=/var \
		--mandir=/usr/man \
		--infodir=/usr/info \
		--enable-shared \
		);
		touch $(JPEG_DIR)/.configured

		$(STAGING_DIR)/lib/libjpeg.so.62.0.0: $(JPEG_DIR)/.configured
		$(MAKE) -C $(JPEG_DIR) CC=$(TARGET_CROSS)gcc all
		$(MAKE) -C $(JPEG_DIR) install-lib
		$(MAKE) -C $(JPEG_DIR) install-headers

		$(TARGET_DIR)/lib/libjpeg.so.62.0.0: $(STAGING_DIR)/lib/libjpeg.so.62.0.0
		cp -dpf $(STAGING_DIR)/lib/libjpeg.so* $(TARGET_DIR)/lib/

		jpeg: uclibc $(TARGET_DIR)/lib/libjpeg.so.62.0.0

		jpeg-clean:
		-$(MAKE) -C $(JPEG_DIR) clean

make/links.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ $(LINKS_DIR)/.configured: $(LINKS_DIR)/.unpacked
		--libexecdir=/usr/lib \
		--sysconfdir=/etc \
		--datadir=/usr/share \
		--localstatedir=/var \
		--localstatedir=/tmp \
		--mandir=/usr/man \
		--infodir=/usr/info \
		--disable-nls \