]> git.ipfire.org Git - people/stevee/ipfire-3.x.git/commitdiff
naoki: Mixed things.
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Nov 2009 20:59:36 +0000 (21:59 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Nov 2009 20:59:36 +0000 (21:59 +0100)
(Can't break this down to several commits.)

 - Changed layout of the package files (slightly).

75 files changed:
pkgs/Config
pkgs/Rules
pkgs/core/acl/acl.nm
pkgs/core/attr/attr.nm
pkgs/core/bash/bash.nm
pkgs/core/binutils/binutils.nm
pkgs/core/bzip2/bzip2.nm
pkgs/core/coreutils/coreutils.nm
pkgs/core/cpio/cpio.nm
pkgs/core/diffutils/diffutils.nm
pkgs/core/e2fsprogs/e2fsprogs.nm
pkgs/core/file/file.nm
pkgs/core/findutils/findutils.nm
pkgs/core/flex/flex.nm
pkgs/core/gawk/gawk.nm
pkgs/core/gcc/gcc.nm
pkgs/core/gettext/gettext.nm
pkgs/core/glibc/glibc.nm
pkgs/core/grep/grep.nm
pkgs/core/gzip/gzip.nm
pkgs/core/kernel-headers/kernel-headers.nm
pkgs/core/kernel/config [moved from src/kernel/kernel.config with 100% similarity]
pkgs/core/kernel/ipfire_logo.ppm [moved from src/kernel/ipfire_logo.ppm with 100% similarity]
pkgs/core/kernel/kernel.nm
pkgs/core/libcap/libcap.nm
pkgs/core/m4/m4.nm
pkgs/core/make/make.nm
pkgs/core/ncurses/ncurses.nm
pkgs/core/patch/patch.nm
pkgs/core/pax-utils/pax-utils.nm
pkgs/core/perl/perl.nm
pkgs/core/sed/sed.nm
pkgs/core/tar/tar.nm
pkgs/core/texinfo/texinfo.nm
pkgs/core/xz/xz.nm
pkgs/core/zlib/zlib.nm
pkgs/toolchain/acl/acl.nm
pkgs/toolchain/attr/attr.nm
pkgs/toolchain/autoconf/autoconf.nm
pkgs/toolchain/automake/automake.nm
pkgs/toolchain/bash/bash.nm
pkgs/toolchain/binutils-static/binutils-static.nm
pkgs/toolchain/binutils/binutils.nm
pkgs/toolchain/bzip2/bzip2.nm
pkgs/toolchain/coreutils/coreutils.nm
pkgs/toolchain/cpio/cpio.nm
pkgs/toolchain/diffutils/diffutils.nm
pkgs/toolchain/e2fsprogs/e2fsprogs.nm
pkgs/toolchain/file/file.nm
pkgs/toolchain/findutils/findutils.nm
pkgs/toolchain/flex/flex.nm
pkgs/toolchain/gawk/gawk.nm
pkgs/toolchain/gcc-static/gcc-static.nm
pkgs/toolchain/gcc/gcc.nm
pkgs/toolchain/gettext/gettext.nm
pkgs/toolchain/glibc/glibc.nm
pkgs/toolchain/grep/grep.nm
pkgs/toolchain/gzip/gzip.nm
pkgs/toolchain/kernel-headers/kernel-headers.nm
pkgs/toolchain/m4/m4.nm
pkgs/toolchain/make/make.nm
pkgs/toolchain/ncurses/ncurses.nm
pkgs/toolchain/patch/patch.nm
pkgs/toolchain/pax-utils/pax-utils.nm
pkgs/toolchain/perl/perl.nm
pkgs/toolchain/sed/sed.nm
pkgs/toolchain/tar/tar.nm
pkgs/toolchain/texinfo/texinfo.nm
pkgs/toolchain/xz/xz.nm
pkgs/toolchain/zlib/zlib.nm
tools/common-constants
tools/common-package-functions
tools/naoki-constants
tools/naoki-functions
tools/quality-agent.d/001-include-files [new file with mode: 0644]

index 12d2e1416905452f158bc5f596db874afd32b6ed..b473ea1fc70a9f469dd75a861ffedd53c4747815 100644 (file)
@@ -32,10 +32,10 @@ DIR_TMP = /tmp
 DIR_SOURCE = $(CURDIR)
 DIR_PACKAGES = /usr/src/packages
 DIR_TOOLS = $(BASEDIR)/tools
+DIR_LOGS = $(BASEDIR)/logs
 
 BUILD_HOST ?= $(shell cat /proc/sys/kernel/hostname)
 
-export DIR_DL DIR_PATCHES DIR_TMP
 VPATH = $(DIR_DL):$(DIR_PATCHES)
 
 PKG_OBJECTS = $(PKG_TARBALL)
@@ -47,12 +47,11 @@ PKG_PACKAGES_FILES = $(foreach package,$(PKG_PACKAGES),$(call DO_PACKAGE_FILENAM
 
 DO_PACKAGE_FILENAME = $(subst --,-,$(PKG_NAME_REAL)-$(subst default,,$(1))-$(PKG_VER)-$(DISTRO_SNAME)$(DISTRO_EPOCH)-$(PKG_REL).ipk)
 
-TC_PACKAGES = binutils gcc glibc make
+TC_PACKAGES = binutils gcc glibc make libtool
 PKG_TOOLCHAIN_DEPS ?= $(TC_PACKAGES)
 PKG_BUILD_DEPS ?= $(TC_PACKAGES)
 
 DO_EXTRACT = $(DIR_TOOLS)/extractor
-DO_LOAD    = $(DIR_TOOLS)/downloader http://source.ipfire.org/source-3.x/$@
 DO_PATCHES = cd $(DIR_APP) && $(DIR_TOOLS)/patch $(foreach patch,$(PKG_PATCHES),$(DIR_PATCHES)/$(patch))
 DO_QUALITY_AGENT = $(DIR_TOOLS)/quality-agent
 
@@ -76,3 +75,65 @@ export PKG_SUMMARY PKG_DESCRIPTION=$(strip $(PKG_DESCRIPTION))
 export PKG_DEPS PKG_BUILD_DEPS
 
 export CONTROL_PREIN CONTROL_PREUN CONTROL_POSTIN CONTROL_POSTUN
+
+define DO_PREPARE
+       @echo "#####################################################################"
+       @echo "# $(PKG_NAME) - Preparation started"
+       @echo "#####################################################################"
+
+       $(STAGE_PREPARE)
+
+       @echo "#####################################################################"
+       @echo "# $(PKG_NAME) - Preparation finished"
+       @echo "#####################################################################"
+endef
+
+define DO_BUILD
+       @echo "#####################################################################"
+       @echo "# $(PKG_NAME) - Build started"
+       @echo "#####################################################################"
+
+       $(STAGE_BUILD)
+
+       @echo "#####################################################################"
+       @echo "# $(PKG_NAME) - Build finished"
+       @echo "#####################################################################"
+endef
+
+define DO_INSTALL
+       @echo "#####################################################################"
+       @echo "# $(PKG_NAME) - Install started"
+       @echo "#####################################################################"
+
+       $(STAGE_INSTALL)
+
+       @echo "#####################################################################"
+       @echo "# $(PKG_NAME) - Install finished"
+       @echo "#####################################################################"
+
+       $(DO_QUALITY_AGENT)
+
+       @echo "# Filelist dump"
+       @cd $(BUILDROOT) && find -ls
+endef
+
+define STAGE_PREPARE
+       $(if $(PKG_TARBALL),cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$(PKG_TARBALL))
+
+       $(if $(PKG_PATCHES),$(DO_PATCHES))
+
+       $(STAGE_PREPARE_CMDS)
+endef
+
+define STAGE_BUILD
+       cd $(DIR_APP) && \
+               ./configure \
+                       $(CONFIGURE_ARCH) \
+                       --prefix=/usr
+
+       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+endef
+
+define STAGE_INSTALL
+       cd $(DIR_APP) && make install $(if $(TOOLCHAIN),,DESTDIR=$(BUILDROOT))
+endef
index 03ebeb89f09a17e756ed1686c2bb557db5306407..8effff026a092aa6323bdae158e2af10bd9641d1 100644 (file)
 include $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))/gmsl
 
 STAGE_PACKAGE_TARGETS = $(call reverse,$(PKG_PACKAGES))
-
-STAGE_PREPARE = $(ROOT)/.prepared
-STAGE_BUILD   = $(ROOT)/.built
-STAGE_INSTALL = $(ROOT)/.installed
-STAGE_PACKAGE = $(STAGE_PACKAGE_TARGETS)
-
-define PRE_PREPARE
-       echo "#####################################################################"
-       echo "# $(PKG_NAME) - Preparation started"
-       echo "#####################################################################"
-endef
-
-define POST_PREPARE
-       echo "#####################################################################"
-       echo "# $(PKG_NAME) - Preparation finished"
-       echo "#####################################################################"
-       touch $(STAGE_PREPARE)
-endef
-
-define PRE_BUILD
-       echo "#####################################################################"
-       echo "# $(PKG_NAME) - Build started"
-       echo "#####################################################################"
-endef
-
-define POST_BUILD
-       echo "#####################################################################"
-       echo "# $(PKG_NAME) - Build finished"
-       echo "#####################################################################"
-       touch $(STAGE_BUILD)
-endef
-
-define PRE_INSTALL
-       echo "#####################################################################"
-       echo "# $(PKG_NAME) - Install started"
-       echo "#####################################################################"
-endef
-
-define POST_INSTALL
-       echo "#####################################################################"
-       echo "# $(PKG_NAME) - Install finished"
-       echo "#####################################################################"
-
-       $(DO_QUALITY_AGENT)
-
-       # Dump filelist
-       cd $(BUILDROOT) && find -ls
-
-       touch $(STAGE_INSTALL)
-endef
-
-.PHONY: prepare build install package
-prepare: $(STAGE_PREPARE)
-build  : $(STAGE_BUILD)
-install: $(STAGE_INSTALL)
-package: $(STAGE_PACKAGE)
-
-download: $(OBJECTS)
+STAGE_DONE = $(ROOT)/.done
 
 info:
        @echo "PKG_BUILD_DEPENDENCIES=\"$(PKG_BUILD_DEPS)\""
        @echo "PKG_DEPENDENCIES=\"$(PKG_DEPS)\""
-       @echo "PKG_DESCRIPTION=\"$(value PKG_DESCRIPTION)\""
-       @echo "PKG_FILES=\"$(objects)\""
+       @echo "PKG_DESCRIPTION=\"$(strip $(PKG_DESCRIPTION))\""
        @echo "PKG_GROUP=\"$(PKG_GROUP)\""
        @echo "PKG_LICENSE=\"$(PKG_LICENSE)\""
        @echo "PKG_MAINTAINER=\"$(PKG_MAINTAINER)\""
        @echo "PKG_NAME=\"$(PKG_NAME_REAL)\""
+       @echo "PKG_OBJECTS=\"$(strip $(PKG_OBJECTS))\""
        @echo "PKG_PACKAGES=\"$(PKG_PACKAGES)\""
        @echo "PKG_PACKAGES_FILES=\"$(PKG_PACKAGES_FILES)\""
        @echo "PKG_VER=\"$(PKG_VER)\""
        @echo "PKG_REL=\"$(PKG_REL)\""
-       @echo "PKG_SUMMARY=\"$(PKG_SUMMARY)\""
+       @echo "PKG_SUMMARY=\"$(strip $(PKG_SUMMARY))\""
        @echo "PKG_URL=\"$(PKG_URL)\""
 ifeq "$(TOOLCHAIN)" "1"
        @echo "PKG_TOOLCHAIN_DEPS=\"$(PKG_TOOLCHAIN_DEPS)\""
 endif
 
 $(OBJECTS):
-       $(DO_LOAD)
+       @echo "Object file \"$@\" is required." >&2
+       @exit 1
 
-$(STAGE_PACKAGE_TARGETS): $(STAGE_INSTALL)
+$(STAGE_PACKAGE_TARGETS): $(STAGE_DONE)
        @echo "$(strip $(PKG_FILES_$@))" > $(DIR_TMP)/filelist_$@
        @/usr/src/src/pakfire/compressor $(DIR_PACKAGES)/$(call DO_PACKAGE_FILENAME,$@) \
                --root=$(BUILDROOT) $(if $(PKG_FILES_$@), --regexes=$(DIR_TMP)/filelist_$@)
 
-$(STAGE_PREPARE): $(OBJECTS)
-       @$(PRE_PREPARE)
-ifneq "$(PKG_TARBALL)" ""
-       cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$(PKG_TARBALL)
-endif
-
-       $(DO_PATCHES)
-
-       @$(POST_PREPARE)
-
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       $(PRE_BUILD)
-
-       cd $(DIR_APP) && \
-               ./configure \
-                       $(CONFIGURE_ARCH) \
-                       --prefix=/usr
-
-       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-
-       $(POST_BUILD)
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
+package: $(STAGE_PACKAGE_TARGETS)
 
-       cd $(DIR_APP) && make install $(if $(TOOLCHAIN),,DESTDIR=$(BUILDROOT))
+shell: $(OBJECTS)
+       $(if $(STAGE_PREPARE),$(DO_PREPARE))
 
-       @$(POST_INSTALL)
+$(STAGE_DONE): $(OBJECTS)
+       $(if $(STAGE_PREPARE),$(DO_PREPARE))
+       $(if $(STAGE_BUILD),$(DO_BUILD))
+       $(if $(STAGE_INSTALL),$(DO_INSTALL))
+       @touch $@
index f93b20c99d9d09059457bbc4bb011cac93657826..5fa995db554e7a869b3f50dda6ae0b941704caa0 100644 (file)
@@ -58,9 +58,7 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \
@@ -69,12 +67,9 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --disable-static
 
        cd $(DIR_APP) && make LIBTOOL="libtool --tag=CC" #$(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)
 
        install -v -m0755 $(DIR_APP)/libacl/.libs/libacl.so.1.1.0 $(BUILDROOT)/lib
@@ -83,5 +78,4 @@ $(STAGE_INSTALL): $(STAGE_BUILD)
        -mkdir -pv $(BUILDROOT)/usr/include/{acl,sys}
        cp -vf $(DIR_APP)/include/libacl.h $(BUILDROOT)/usr/include/acl/
        cp -vf $(DIR_APP)/include/acl.h $(BUILDROOT)/usr/include/sys/
-
-       @$(POST_INSTALL)
+endef
index 3f8fdc277b78016430722abc066f0940e40f8dba..1a6e993804d2a4a9b9920a18def8c1624a7b7b05 100644 (file)
@@ -49,9 +49,7 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \
@@ -60,12 +58,9 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --enable-shared
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)
 
        install -v -m0755 $(DIR_APP)/libattr/.libs/libattr.so.1.1.0 $(BUILDROOT)/lib
@@ -74,5 +69,4 @@ $(STAGE_INSTALL): $(STAGE_BUILD)
        install -v -d $(BUILDROOT)/usr/include/attr
        cp -vf $(DIR_APP)/include/{attributes.h,error_context.h,libattr.h,xattr.h} \
                $(BUILDROOT)/usr/include/attr/
-
-       @$(POST_INSTALL)
+endef
index bed47b0cb1f986fb05bbd78c5b4723ff08c03841..c83cc4f9c1a34616f82fb47c9f57c85ae57f9316 100644 (file)
@@ -64,26 +64,17 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_PREPARE): $(OBJECTS)
-       @$(PRE_PREPARE)
-       cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$(PKG_TARBALL)
-
-       $(DO_PATCHES)
-       
+define STAGE_PREPARE_CMDS
        # Bash uses the RTLD_LAZY option when loading libraries. We want to use
        # RTLD_NOW (it is defined from <dlfcn.h>:
        cd $(DIR_APP) && sed -e "s/filename, RTLD_LAZY/filename, RTLD_NOW/" \
                -i builtins/enable.def
 
-       @$(POST_PREPARE)
-
-
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-       
        cd $(DIR_APP) && sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/$(THISAPP)|" \
                Makefile.in
+endef
 
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ac_cv_func_working_mktime=yes \
                ./configure \
@@ -94,12 +85,9 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --with-installed-readline
 
        cd $(DIR_APP) && make #$(PARALLELISMFLAGS)
-       
-       @$(POST_BUILD)
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
+endef
 
+define STAGE_INSTALL
        -mkdir -pv $(BUILDROOT)/{bin,etc/profile.d}
        cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)
 
@@ -108,5 +96,4 @@ $(STAGE_INSTALL): $(STAGE_BUILD)
 
        # /etc/profile.d
        cp -vf $(DIR_SOURCE)/profile.d/* $(BUILDROOT)/etc/profile.d
-
-       @$(POST_INSTALL)
+endef
index 57c4f6742d75606409321226102027fa8bd9ae83..70b4652f602c670e373dad4d36c2ee8f2f0832c9 100644 (file)
@@ -42,11 +42,11 @@ endef
 PKG_BUILD_DEPS = glibc
 PKG_DEPS      += zlib
 
-PKG_OBJECTS   += $(THISAPP).tar.bz2
+PKG_TARBALL   += $(THISAPP).tar.bz2
 
 PKG_PATCHES   += $(THISAPP)-ld_makefile.patch
 PKG_PATCHES   += $(THISAPP)-pt_pax-1.patch
-PKG_PATCHES   += $(THISAPP)-lazy-1.patch
+#PKG_PATCHES   += $(THISAPP)-lazy-1.patch
 PKG_PATCHES   += $(THISAPP)-asprintf_fix.patch
 
 include ../../Rules
@@ -55,20 +55,11 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_PREPARE): $(OBJECTS)
-       @$(PRE_PREPARE)
-       cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$(THISAPP).tar.bz2
-
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-pt_pax-1.patch
-       cd $(DIR_APP) && patch -Np0 -i $(DIR_PATCHES)/$(THISAPP)-asprintf_fix.patch
-       
+define STAGE_PREPARE_CMDS
        -mkdir -pv $(DIR_SRC)/binutils-build
+endef
 
-       @$(POST_PREPARE)
-
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_SRC)/binutils-build && \
                CC="gcc -specs=$$(dirname $$(gcc --print-libgcc-file-name))/myspecs -B/usr/lib/ -B/usr/bin/" \
                ../$(THISAPP)/configure \
@@ -80,14 +71,10 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --disable-static
 
        cd $(DIR_SRC)/binutils-build && make tooldir=/usr $(PARALLELISMFLAGS)
-       
-       @$(POST_BUILD)
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
+endef
 
+define STAGE_INSTALL
        cd $(DIR_SRC)/binutils-build && make tooldir=/usr install DESTDIR=$(BUILDROOT)
 
        cp -fv $(DIR_APP)/include/libiberty.h $(BUILDROOT)/usr/include
-
-       @$(POST_INSTALL)
+endef
index 57e2e854d3425fc722ac62a23e2e1cb81b2c5576..410336d4af0256098ab77213af8695a976bca072 100644 (file)
@@ -53,30 +53,19 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_PREPARE): $(OBJECTS)
-       @$(PRE_PREPARE)
-       cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$(PKG_TARBALL)
-
-       $(DO_PATCHES)
-
+define STAGE_PREPARE_CMDS
        cd $(DIR_APP) && sed -i 's@\(ln -s -f \)\$$(PREFIX)/bin/@\1@' Makefile
        cd $(DIR_APP) && sed -e "s/$$(CC) -shared/& $(CFLAGS)/" -i Makefile-libbz2_so
+endef
 
-       @$(POST_PREPARE)
-
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
-       cd $(DIR_APP) && make -f Makefile-libbz2_so
+define STAGE_BUILD
+       cd $(DIR_APP) && make -f Makefile-libbz2_so $(PARALLELISMFLAGS)
 
        cd $(DIR_APP) && make clean
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_APP) && make PREFIX=$(BUILDROOT)/usr install
 
        -mkdir -pv $(BUILDROOT)/{bin,lib}
@@ -87,5 +76,4 @@ $(STAGE_INSTALL): $(STAGE_BUILD)
        ln -sfv bzip2 $(BUILDROOT)/bin/bunzip2
        ln -sfv bzip2 $(BUILDROOT)/bin/bzcat
        rm -vf $(BUILDROOT)/usr/lib/libbz2.a
-
-       @$(POST_INSTALL)
+endef
index 38d459165d9cdc4d859d92f706064776f3ba5b8b..24b97cae6e66fd8fcb779ce26a9183c0e39e88c3 100644 (file)
@@ -56,19 +56,11 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_PREPARE): $(OBJECTS)
-       @$(PRE_PREPARE)
-       cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$(PKG_TARBALL)
-
-       $(DO_PATCHES)
-
+define STAGE_PRAPRE_CMDS
        cd $(DIR_APP) && autoreconf --force
+endef
 
-       @$(POST_PREPARE)
-
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                gl_cv_func_printf_directive_n=no \
                ./configure \
@@ -80,12 +72,9 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS) \
                CPPFLAGS="-DUSE_PAM" su_LDFLAGS="-pie -lpam -lpam_misc"
+endef
 
-       @$(POST_BUILD)
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)
 
        -mkdir -pv $(BUILDROOT)/{bin,etc/{pam,profile}.d}
@@ -103,5 +92,4 @@ $(STAGE_INSTALL): $(STAGE_BUILD)
 
        # PAM
        cp -vf $(DIR_SOURCE)/pam.d/su{,-l} $(BUILDROOT)/etc/pam.d
-
-       @$(POST_INSTALL)
+endef
index 009d4fb8a09d35f86642bc290e448d5790a87b16..484c037e7257c78c9a12016858aad26500562583 100644 (file)
@@ -52,21 +52,11 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_PREPARE): $(OBJECTS)
-       $(PRE_PREPARE)
-ifneq "$(PKG_TARBALL)" ""
-       cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$(PKG_TARBALL)
-endif
-
-       $(DO_PATCHES)
-
+define STAGE_PREPARE_CMDS
        cd $(DIR_APP) && autoreconf --force
+endef
 
-       $(POST_PREPARE)
-
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH)\
@@ -76,5 +66,4 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --with-rmt=/usr/sbin/rmt
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-
-       @$(POST_BUILD)
+endef
index b80dae08464d2caeda301681ac5f1681de50547a..40fe105933f962078761525d01fadebab13b810a 100644 (file)
@@ -47,19 +47,3 @@ PKG_PATCHES   += $(THISAPP)-i18n-1.patch
 PKG_PATCHES   += $(THISAPP)-hardened_tmp-1.patch
 
 include ../../Rules
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
-       cd $(DIR_APP) && \
-               ./configure \
-                       $(CONFIGURE_ARCH) \
-                       --prefix=/usr
-
-       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-
-       @$(POST_BUILD)
index ec9368741686c83c587a6b3b92943ff5bc0b73a2..031f723d06ee6ee74d0c1fb43248e0772bbf3a7b 100644 (file)
@@ -52,12 +52,7 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_PREPARE): $(OBJECTS)
-       @$(PRE_PREPARE)
-       cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$(PKG_TARBALL)
-
-       $(DO_PATCHES)
-
+define STAGE_PREPARE
        -mkdir $(DIR_APP)/build
 
        # Fix DT_TEXTREL in e2fsprogs libraries. --disable-shared and
@@ -74,12 +69,9 @@ $(STAGE_PREPARE): $(OBJECTS)
        cd $(DIR_APP) && sed \
                -e "s/getenv(\"BLKID_DEBUG\")/safe_getenv(\"BLKID_DEBUG\")/" \
                -i lib/blkid/cache.c
+endef
 
-       @$(POST_PREPARE)
-
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP)/build && \
                LDFLAGS=-lblkid \
                ../configure \
@@ -93,12 +85,9 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --disable-libuuid
 
        cd $(DIR_APP)/build && make $(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_APP)/build && make install DESTDIR=$(BUILDROOT)
        cd $(DIR_APP)/build && make install-libs DESTDIR=$(BUILDROOT)
 
@@ -107,5 +96,4 @@ $(STAGE_INSTALL): $(STAGE_BUILD)
        ln -svf ../../lib/libext2fs.so.2 $(BUILDROOT)/usr/lib/libext2fs.so
        ln -svf ../../lib/libss.so.2 $(BUILDROOT)/usr/lib/libss.so
        ln -svf ../../lib/libuuid.so.1 $(BUILDROOT)/usr/lib/libuuid.so
-
-       @$(POST_INSTALL)
+endef
index 7ec28f5f882e073c34e7151faf1a8d6f0ee69194..4858b892d978e6eb8e4e7ea66764b9b0873f8360 100644 (file)
@@ -49,9 +49,7 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \
@@ -59,14 +57,4 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --disable-static
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-
-       @$(POST_BUILD)
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
-       cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)
-
-       rm -vf $(BUILDROOT)/usr/lib/libmagic.la
-
-       @$(POST_INSTALL)
+endef
index d3a2a832d4fb555c5a911c258b47bec4293de3df..419d89ea397d2e2dee414acbb3db9861fe26935d 100644 (file)
@@ -51,9 +51,7 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \
@@ -62,16 +60,12 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --localstatedir=/var/lib/locate
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)
 
        mv -v $(BUILDROOT)/usr/bin/find $(BUILDROOT)/bin
 
        sed -i -e 's/find:=$${BINDIR}/find:=\/bin/' $(BUILDROOT)/usr/bin/updatedb
-
-       @$(POST_INSTALL)
+endef
index a06bb0f7dd9053c1826ee1e1528e106caf60a60a..b02ae18afb20160eb768b2af5119b00c5f3957f3 100644 (file)
@@ -56,9 +56,7 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \
@@ -66,15 +64,12 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --disable-static
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)
        echo "#!/bin/sh"                        >  $(BUILDROOT)/usr/bin/lex
        echo "exec /usr/bin/flex -l \"$$@\""    >> $(BUILDROOT)/usr/bin/lex
        chmod 755 $(BUILDROOT)/usr/bin/lex
+endef
 
-       @$(POST_INSTALL)
index 557bb681dc559473e67eb0e3100ca3b50340cce0..37a1415a8ce60f982b1403ec2f314ecbc201e6f9 100644 (file)
@@ -48,9 +48,7 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ac_cv_func_working_mktime=yes \
                ./configure \
@@ -62,5 +60,4 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
        cd $(DIR_APP) && echo "#define HAVE_LC_MESSAGES 1" >> config.h
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-
-       @$(POST_BUILD)
+endef
index 0cd7ae5a28087c14f68d19086647853dab79e81b..2b0f31db8b21da39441bb21dee7f14d8e9dcbca0 100644 (file)
@@ -39,7 +39,7 @@ define PKG_DESCRIPTION
        You'll need this package in order to compile C code.
 endef
 
-PKG_BUILD_DEPS = binutils glibc
+PKG_BUILD_DEPS = binutils glibc kernel-headers
 
 CFLAGS         = -D__USE_XOPEN2K8 -pipe
 CXXFLAGS       =
@@ -57,7 +57,7 @@ else
        CONFIG_CPU = --with-cpu=$(TARGET_MACHINE) --with-arch=$(TARGET_MACHINE)
 endif
 
-PKG_OBJECTS   += $(THISAPP).tar.bz2
+PKG_TARBALL   += $(THISAPP).tar.bz2
 PKG_OBJECTS   += gmp-$(GMP).tar.bz2
 PKG_OBJECTS   += mpfr-$(MPFR).tar.bz2
 
@@ -67,13 +67,13 @@ PKG_PATCHES   += $(THISAPP)-espf-1.patch \
 
 include ../../Rules
 
+export CPP = $(TOOLS_DIR)/bin/cpp
+
 ###############################################################################
 # Installation Details
 ###############################################################################
 
-$(STAGE_PREPARE): $(OBJECTS)
-       @$(PRE_PREPARE)
-       @rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$(firstword $(PKG_OBJECTS))
+define STAGE_PREPARE_CMDS
        -mkdir -v $(DIR_SRC)/gcc-build
 
        # First, unpack gmp and mpfr.
@@ -89,28 +89,19 @@ $(STAGE_PREPARE): $(OBJECTS)
                $(DIR_APP)/gcc/{fortran,java,objc,objcp}
 
        # Branding gcc
-       cd $(DIR_APP) && sed -e "s:PKGVERSION:\"(GCC for $(NAME)-${VERSION}) \":" \
+       cd $(DIR_APP) && sed -e "s:PKGVERSION:\"(GCC for $(DISTRO_NAME)-$(DISTRO_VERSION)) \":" \
                -i gcc/version.c
 
        # Libgomp uses -Werror regardless of --disable-werror, and this will cause a
        # build failure when -D_FORTIFY_SOURCE=2 causes build time warnings:
        cd $(DIR_APP) && sed -e "s/-Werror//" -i libgomp/configure
 
-       @$(POST_PREPARE)
-
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-espf-1.patch
-
        cd $(DIR_APP) && sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in
        cd $(DIR_APP) && sed -i 's/^XCFLAGS =$$/& -fomit-frame-pointer/' gcc/Makefile.in
        cd $(DIR_APP) && sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
+endef
 
-       # Libgomp uses -Werror regardless of --disable-werror, and this will cause a
-       # build failure when -D_FORTIFY_SOURCE=2 causes build time warnings:
-       cd $(DIR_APP) && sed -e "s/-Werror//" -i libgomp/configure
-
+define STAGE_BUILD
        cd $(DIR_SRC)/gcc-build && \
                ../$(THISAPP)/configure \
                        $(CONFIGURE_ARCH) \
@@ -131,15 +122,11 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        $(CONFIGURE_ARGS)
 
        cd $(DIR_SRC)/gcc-build && make $(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_SRC)/gcc-build && make install DESTDIR=$(BUILDROOT)
 
        ln -sfv ../usr/bin/cpp $(BUILDROOT)/lib
        ln -sfv gcc $(BUILDROOT)/usr/bin/cc
-
-       @$(POST_INSTALL)
+endef
index cc27d4edd988e43e885b2eb499e721cefbe73cfa..63a4a66815013ebce597fecdc4da8caa1d5b2ef3 100644 (file)
@@ -63,9 +63,7 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \
@@ -73,14 +71,4 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --disable-static
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-
-       @$(POST_BUILD)
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
-       cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)
-
-       rm -vf $(BUILDROOT)/usr/lib/lib{asprintf,gettext{lib,po,src}}.la
-
-       @$(POST_INSTALL)
+endef
index c35267d28a3228cc35a7a6d07d3c4cde7b8d3aef..c762f3a93288558bb69337c94bb30d9060bb6ccb 100644 (file)
@@ -133,9 +133,8 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_PREPARE): $(OBJECTS)
-       @@$(PRE_PREPARE)
-       @rm -rf $(DIR_APP) $(DIR_SRC)/glibc-build && cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$(firstword $(PKG_OBJECTS))
+define STAGE_PREPARE
+       @cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$(firstword $(PKG_OBJECTS))
        @mkdir $(DIR_SRC)/glibc-build
 
        # In the vi_VN.TCVN locale, bash enters an infinite loop at startup. It is
@@ -165,12 +164,9 @@ $(STAGE_PREPARE): $(OBJECTS)
 
        cat $(DIR_SOURCE)/$(THISAPP)-stack_chk_fail.c \
                > $(DIR_APP)/debug/stack_chk_fail.c
+endef
 
-       @$(POST_PREPARE)
-
-
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
+define STAGE_BUILD
        # --enable-stackguard-randomization could be added here, but this is primarily
        # for attacks by local users, and we shouldn't have those in the rebooted
        # system. Adding this will empty the /dev/random entropy pool (via
@@ -218,12 +214,9 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
        echo "CXXFLAGS = $(CXXFLAGS)" >> $(DIR_SRC)/glibc-build/configparms
        cd $(DIR_SRC)/glibc-build && make PARALLELMFLAGS=$(PARALLELISMFLAGS) \
                CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
+endef
 
-       @$(POST_BUILD)
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_SRC)/glibc-build && make install install_root=$(BUILDROOT)
 
        # Locales
@@ -237,5 +230,4 @@ $(STAGE_INSTALL): $(STAGE_BUILD)
 
        # Configuration
        cp -vf $(DIR_SOURCE)/{ld.so.conf,nsswitch.conf} $(BUILDROOT)/etc
-
-       @$(POST_INSTALL)
+endef
index eefad222f9c280256a1bf86e2e8f21a648dcb35c..01d820f91dee15c6e55ea693c6fa7142cc018d6d 100644 (file)
@@ -48,9 +48,7 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        # --without-included-regex makes Grep use libc for regex. This gets rid of
        # some compiler warnings, and I can't imagine why it's unsafe.
 
@@ -62,5 +60,4 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --without-included-regex
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-
-       @$(POST_BUILD)
+endef
index 1393fe18fa218aa63d357fc6a0e9071d67421e6f..76b5192f9c13d46b28bd8e6da97d40c345e878bb 100644 (file)
@@ -57,9 +57,7 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        # NO_ASM is for textrels.
        cd $(DIR_APP) && \
                DEFS=NO_ASM \
@@ -70,16 +68,12 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --bindir=/bin
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)
 
        -mkdir -pv $(BUILDROOT)/usr/bin
        mv -v $(BUILDROOT)/bin/{gzexe,uncompress,zcmp,zdiff,zegrep} $(BUILDROOT)/usr/bin
        mv -v $(BUILDROOT)/bin/{zfgrep,zforce,zgrep,zless,zmore,znew} $(BUILDROOT)/usr/bin
-
-       @$(POST_INSTALL)
+endef
index 93e76a740c2e320acd0e37eb4a14e3b644eea0f6..65925aa0ef49a485829c04ff4c15260be82d781e 100644 (file)
@@ -1,19 +1,15 @@
 
 include ../../core/kernel/kernel.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-       
+STAGE_PREPARE_CMDS =
+
+define STAGE_BUILD
        cd $(DIR_APP) && make mrproper
        cd $(DIR_APP) && make ARCH=x86 headers_check
+endef
 
-       @$(POST_BUILD)
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-       
+define STAGE_INSTALL
        cd $(DIR_APP) && make ARCH=x86 INSTALL_HDR_PATH=dest headers_install
        -mkdir -pv $(BUILDROOT)/usr/include
        cd $(DIR_APP) && cp -rv dest/include/* $(BUILDROOT)/usr/include
-
-       @$(POST_INSTALL)
+endef
index 3624543900901308871cee07df71138c48db65f8..ebc58616b9e38aa0d7bbcd39b9fc2b56d518241f 100644 (file)
@@ -70,9 +70,9 @@ PKG_PATCHES   += $(REISER4_PATCH)
 ROUTES_PATCH   = routes-$(PKG_VER)-16.diff 
 PKG_PATCHES   += $(ROUTES_PATCH)
 
-PKG_OBJECTS   += $(THISAPP).tar.bz2
+PKG_TARBALL    = $(THISAPP).tar.bz2
 
-PKG_PATCHES   += $(THISAPP)-disable-compat_vdso-1.patch
+#PKG_PATCHES   += $(THISAPP)-disable-compat_vdso-1.patch
 
 include ../../Rules
 
@@ -80,66 +80,48 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_PREPARE): $(OBJECTS)
-       @$(PRE_PREPARE)
-       rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$(firstword $(PKG_OBJECTS))
-
+define STAGE_PREPARE_CMDS
        cd $(DIR_APP) && echo "$(LOCALVERSION)" > localversion-ipfire
-
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(AUFS_PATCH)
-       #cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(OCF_PATCH)
-       #cd $(DIR_APP) && echo "source \"crypto/ocf/Kconfig\"" >> crypto/Kconfig
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(REISER4_PATCH)
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(ROUTES_PATCH)
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(GRSEC_PATCH)
        rm -f $(DIR_APP)/localversion-grsec
 
-       #cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-disable-compat_vdso-1.patch
-       
        cd $(DIR_APP) && sed -e "s/^HOSTCFLAGS.*=.*/& -fPIC/g" -i Makefile
 
-       @$(POST_PREPARE)
-
-
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
+       #cd $(DIR_APP) && echo "source \"crypto/ocf/Kconfig\"" >> crypto/Kconfig
+       
+       cd $(DIR_APP) && cp -vf $(DIR_SOURCE)/$(DISTRO_SNAME)_logo.ppm \
+               drivers/video/logo/logo_linux_clut224.ppm
+endef
 
+define STAGE_BUILD
        cd $(DIR_APP) && make mrproper
 
        # Select right optimization for the linux kernel.
        if [ "$(TARGET)" == "i486" ]; then \
                sed -e "s/^CONFIG_M686=y/# CONFIG_686 is not set/" \
                        -e "s/^# CONFIG_M486 is not set/CONFIG_M486=y/" \
-                       < $(DIR_SOURCE)/kernel/kernel.config > $(DIR_APP)/.config; \
+                       < $(DIR_SOURCE)/config > $(DIR_APP)/.config; \
        elif [ "$(TARGET)" == "i586" ]; then \
                sed -e "s/^CONFIG_M686=y/# CONFIG_686 is not set/" \
                        -e "s/^# CONFIG_M586TSC is not set/CONFIG_M586TSC=y/" \
-                       < $(DIR_SOURCE)/kernel/kernel.config > $(DIR_APP)/.config; \
+                       < $(DIR_SOURCE)/config > $(DIR_APP)/.config; \
        elif [ "$(TARGET)" == "via-c7" ]; then \
                sed -e "s/^CONFIG_M686=y/# CONFIG_686 is not set/" \
                        -e "s/^# CONFIG_MVIAC7 is not set/CONFIG_MVIAC7=y/" \
-                       < $(DIR_SOURCE)/kernel/kernel.config > $(DIR_APP)/.config; \
+                       < $(DIR_SOURCE)/config > $(DIR_APP)/.config; \
        elif [ "$(TARGET)" == "via-c3" ]; then \
                sed -e "s/^CONFIG_M686=y/# CONFIG_686 is not set/" \
                        -e "s/^# CONFIG_MVIAC3_2 is not set/CONFIG_MVIAC3_2=y/" \
-                       < $(DIR_SOURCE)/kernel/kernel.config > $(DIR_APP)/.config; \
+                       < $(DIR_SOURCE)/config > $(DIR_APP)/.config; \
        else \
-               cp -f $(DIR_SOURCE)/kernel/kernel.config $(DIR_APP)/.config; \
+               cp -f $(DIR_SOURCE)/config $(DIR_APP)/.config; \
        fi
 
        cd $(DIR_APP) && yes "" | make oldconfig
-
-       cd $(DIR_APP) && cp -vf $(DIR_SOURCE)/kernel/$(SNAME)_logo.ppm \
-               drivers/video/logo/logo_linux_clut224.ppm
        
        cd $(DIR_APP) && make CC="gcc -nopie" $(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_APP) && make modules_install
        
        cd $(DIR_APP) && cp -v arch/x86/boot/bzImage /boot/$(SNAME)kernel-$(FULLVER)
@@ -155,5 +137,4 @@ $(STAGE_INSTALL): $(STAGE_BUILD)
        ln -svf $(DIR_SRC)/$(PKG_NAME)-$(FULLVER) /lib/modules/$(KVER)/build
        ln -svf $(DIR_SRC)/$(PKG_NAME)-$(FULLVER) /lib/modules/$(KVER)/source
        -mkdir -pv /lib/modules/$(KVER)/extra
-
-       @$(POST_INSTALL)
+endef
index d250e0c786f7368eb603282f51ee33c733871bdc..2114f0e3dd968028d6cf99fa39e142e58b484732 100644 (file)
@@ -53,28 +53,16 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_PREPARE): $(OBJECTS)
-       @$(PRE_PREPARE)
-       cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$(PKG_TARBALL)
-
-       $(DO_PATCHES)
-
+define STAGE_PREPARE_CMDS
        cd $(DIR_APP) && sed -e "s@<stdlib.h>@&\n#include <asm/types.h>@g" \
                -i progs/capsh.c
        cd $(DIR_APP) && sed 's/--static//' -i.orig progs/Makefile
+endef
 
-       @$(POST_PREPARE)
-
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && make $(PARALLELISMFLAGS) CC="gcc $(CFLAGS)"
+endef
 
-       @$(POST_BUILD)
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT) lib=/lib
-
-       @$(POST_INSTALL)
+endef
index cbc0feabc4802a2bf58d5c514f6c39e010de01f7..428fefa29248a68eeb3c3c99383d68b68d91ecf8 100644 (file)
@@ -51,9 +51,7 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        # We need -D_GNU_SOURCE because this version of M4 has a bug in gnulib (or
        # possibly autoconf) that doesn't recognise that we have asprintf() in libc.
        cd $(DIR_APP) && \
@@ -64,5 +62,4 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --prefix=/usr
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-
-       @$(POST_BUILD)
+endef
index ae1ee7a5db44eb53855f7c8984c7c8f4ec61e476..150a3a3a3df7c9884f469c118a7bf1c9d691652a 100644 (file)
@@ -48,19 +48,3 @@ PKG_BUILD_DEPS:= $(filter-out make,$(PKG_BUILD_DEPS))
 PKG_TARBALL    = $(THISAPP).tar.bz2
 
 include ../../Rules
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
-       cd $(DIR_APP) && \
-               ./configure \
-                       $(CONFIGURE_ARCH) \
-                       --prefix=/usr
-
-       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-
-       @$(POST_BUILD)
index b13d54919172820d38f48d1ecf384d6a2bb6fa1d..f27a772387ac6d1943ad7f7396fb3b1e6119ad44 100644 (file)
@@ -51,9 +51,7 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \
@@ -66,12 +64,9 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --disable-root-environ
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)
 
        -mkdir -pv $(BUILDROOT)/lib
@@ -85,5 +80,4 @@ $(STAGE_INSTALL): $(STAGE_BUILD)
        rm -vf $(BUILDROOT)/usr/lib/libcursesw.so
        echo "INPUT(-lncursesw)" >$(BUILDROOT)/usr/lib/libcursesw.so
        ln -sfv libncurses.so $(BUILDROOT)/usr/lib/libcurses.so
-
-       @$(POST_INSTALL)
+endef
index c60eb3c4062feb0ca3529238f79a10b50fc62d95..6b7c1b6ecbe40e7b31b41b399b18a87f634b47d8 100644 (file)
@@ -56,9 +56,6 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_APP) && make install prefix=$(BUILDROOT)/usr
-
-       @$(POST_INSTALL)
+endef
index 6d27f082ea89524365cec077ec625891b4639e00..b9d8fd6e7e07ff8323e0e95c16018cca59f8a222 100644 (file)
@@ -48,9 +48,6 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" USE_CAP=yes $(PARALLELISMFLAGS)
-
-       @$(POST_BUILD)
+endef
index 1f59296d58f5a5074f400ae00b6c5d901eb46311..9fbb02509a8dcdf91fe64168842336696af31f8f 100644 (file)
@@ -65,19 +65,11 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_PREPARE): $(OBJECTS)
-       @$(PRE_PREPARE)
-       cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$(PKG_TARBALL)
-
-       $(DO_PATCHES)
-
+define STAGE_PREPARE_CMDS
        cd $(DIR_APP) && sed -i 's/command /command[ -]/' makedepend.SH
+endef
 
-       @$(POST_PREPARE)
-
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && sed -i -e "s|BUILD_ZLIB\s*= True|BUILD_ZLIB = False|" \
                                                        -e "s|INCLUDE\s*= ./zlib-src|INCLUDE = /usr/include|" \
                                                        -e "s|LIB\s*= ./zlib-src|LIB = /usr/lib|" \
@@ -88,5 +80,4 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                -Dpager="/usr/bin/less -isR"
 
        cd $(DIR_APP) && make #$(PARALLELISMFLAGS)
-
-       @$(POST_BUILD)
+endef
index 1773cae67009a9d2fb202011bb87b6dc2198fc4b..7597217333f5feebdb6615b4f5858ac61b31e323 100644 (file)
@@ -50,9 +50,7 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \
@@ -62,5 +60,4 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --without-included-regex
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-
-       @$(POST_BUILD)
+endef
index 09368a3d902d712c6fcff873fb038b4d038e4236..eadb1ead1e7475d9487c4b953600bd8dacaaaec3 100644 (file)
@@ -62,9 +62,7 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                CC="$(TARGET)-gcc -std=gnu99 -fgnu89-inline" \
                ./configure \
@@ -74,5 +72,4 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --libexecdir=/usr/sbin
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-
-       @$(POST_BUILD)
+endef
index 9ec47ae572ea3bf37b1e73cf2f7f393283d96689..8cfa4d3f6781774b04eafa73dbb2b498f1af7abb 100644 (file)
@@ -53,9 +53,7 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                LDFLAGS="-lncursesw" \
                ./configure \
@@ -63,5 +61,4 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --prefix=/usr
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-
-       @$(POST_BUILD)
+endef
index b1c775e22b3677c04beaee664378a0c60247efea..8977449629e7fceb070feb6f32dd655d1692292e 100644 (file)
@@ -58,9 +58,7 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \
@@ -68,5 +66,4 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --disable-static
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-
-       @$(POST_BUILD)
+endef
index 04c12c9b4d065f46e282f3d309fe4f6aad1cc4ef..a9deef4c1c863e97bded54eef11b1954827b4433 100644 (file)
@@ -51,9 +51,7 @@ include ../../Rules
 # Installation Details
 ###############################################################################
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ac_cv_func_working_mktime=yes \
                ./configure \
@@ -62,16 +60,12 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --libdir=/lib \
                        --disable-static
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)
        -mkdir -pv $(BUILDROOT)/usr/{include,lib}
        cd $(DIR_APP) && cp -pfv zconf.h zlib.h $(BUILDROOT)/usr/include
        rm -vf $(BUILDROOT)/lib/libz.so
        ln -sfv ../../lib/libz.so.$(PKG_VER) $(BUILDROOT)/usr/lib/libz.so
-
-       @$(POST_INSTALL)
+endef
index 0c85c3b8f0698a13044bd9b7b2e013614ad5d94a..5804e2128ef97892afb8948159b8a7944e20d979 100644 (file)
@@ -3,22 +3,15 @@ PKG_TOOLCHAIN_DEPS += attr
 
 include ../../core/acl/acl.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \
                        --prefix=$(TOOLS_DIR)
 
        cd $(DIR_APP) && make LIBTOOL="libtool --tag=CC" #$(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_APP) && make install install-dev install-lib
-
-       @$(POST_INSTALL)
+endef
index 7d8bda63cd74d1d1405f21903dbd96f6bacdfb22..ddb1aeac4321e48c737afdaacc243afe95dbb017 100644 (file)
@@ -1,9 +1,7 @@
 
 include ../../core/attr/attr.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \
@@ -11,13 +9,9 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --enable-shared
 
        cd $(DIR_APP) && make LIBTOOL="libtool --tag=CC" #$(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_APP) && make install
 
        install -v -m0755 $(DIR_APP)/libattr/.libs/libattr.so.1.1.0 $(TOOLS_DIR)/lib
@@ -26,5 +20,4 @@ $(STAGE_INSTALL): $(STAGE_BUILD)
        install -v -d $(TOOLS_DIR)/include/attr
        cp -vf $(DIR_APP)/include/{attributes.h,error_context.h,libattr.h,xattr.h} \
                $(TOOLS_DIR)/include/attr/
-
-       @$(POST_INSTALL)
+endef
index 98c17da54690258c899ea6f3a22bcbcfc5e59085..ff72b1a4aaf89d349bc828af9649066f948fc86a 100644 (file)
@@ -3,14 +3,11 @@ PKG_TOOLCHAIN_DEPS += perl
 
 include ../../core/autoconf/autoconf.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \
                        --prefix=$(TOOLS_DIR)
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-
-       @$(POST_BUILD)
+endef
index 466c02e2a56840bd3d43995077554f54fd767173..7bfea6032ea015642f1b55429c596a9cfe4271be 100644 (file)
@@ -3,14 +3,11 @@ PKG_TOOLCHAIN_DEPS += autoconf perl
 
 include ../../core/automake/automake.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \
                        --prefix=$(TOOLS_DIR)
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-
-       @$(POST_BUILD)
+endef
index 435211034a674a0bb14ecec85939fd32bf9befa4..d73d2c466da05770cad80afb71ba6d4e2ced49a4 100644 (file)
@@ -1,19 +1,9 @@
 
 include ../../core/bash/bash.nm
 
-$(STAGE_PREPARE): $(OBJECTS)
-       @$(PRE_PREPARE)
-       cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$(PKG_TARBALL)
-
-       #$(DO_PATCHES) Do not apply patches at toolchain because
-       # this will require an autoreconf that is only possible
-       # with the latest version of autoconf (which CentOS hasn't got)
-
-       @$(POST_PREPARE)
-
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
+PKG_PATCHES =
 
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ac_cv_func_working_mktime=yes \
                ./configure \
@@ -22,15 +12,10 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --without-bash-malloc
 
        cd $(DIR_APP) && make #$(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_APP) && make install
 
        ln -svf bash $(TOOLS_DIR)/bin/sh
-
-       @$(POST_INSTALL)
+endef
index 23bedd18d286875a9b1da220aa768cacc5cbd04c..57a5d3ec70a8b86f5eaa367de7e8ce9326a96087 100644 (file)
@@ -3,9 +3,7 @@ PKG_TOOLCHAIN_DEPS += kernel-headers
 
 include ../../core/binutils/binutils.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_SRC)/binutils-build && \
                CC="gcc -B/usr/bin/" \
                ../$(THISAPP)/configure \
@@ -16,13 +14,8 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --disable-werror
 
        cd $(DIR_SRC)/binutils-build && make tooldir=$(TOOLS_DIR) $(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_SRC)/binutils-build && make tooldir=$(TOOLS_DIR) install
-
-       @$(POST_INSTALL)
+endef
index bc830eb14d2f5f342663210cf62d196072338297..83f84a0fec67b5f9499aa1a77a2391f77372de99 100644 (file)
@@ -3,9 +3,7 @@ PKG_TOOLCHAIN_DEPS += binutils-static glibc
 
 include ../binutils-static/binutils-static.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_SRC)/binutils-build && \
                ../$(THISAPP)/configure \
                        $(CONFIGURE_ARCH) \
@@ -17,17 +15,12 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --disable-werror
 
        cd $(DIR_SRC)/binutils-build && make tooldir=$(TOOLS_DIR) $(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_SRC)/binutils-build && make tooldir=$(TOOLS_DIR) install
 
        cd $(DIR_SRC)/binutils-build && make -C ld clean
        cd $(DIR_SRC)/binutils-build && make -C ld LIB_PATH=/lib:/usr/lib
        cd $(DIR_SRC)/binutils-build && cp -v ld/.libs/ld-new $(TOOLS_DIR)/bin
-
-       @$(POST_INSTALL)
+endef
index f00b553009c1843887e0dbf710944c77894c3d4f..436eebec860180f7560d0ec4cf0785e601ec8e69 100644 (file)
@@ -1,17 +1,10 @@
 
 include ../../core/bzip2/bzip2.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_APP) && make PREFIX=$(TOOLS_DIR) install
-
-       @$(POST_INSTALL)
+endef
index 0db1c6aa5e0b32b19d28c48869b6b4b6ef131cb4..a04009c4892fefde175122e0bfd389c04e8a1106 100644 (file)
@@ -3,9 +3,7 @@ PKG_TOOLCHAIN_DEPS += acl attr ncurses
 
 include ../../core/coreutils/coreutils.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                gl_cv_func_printf_directive_n=no \
                ./configure \
@@ -14,15 +12,10 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --enable-install-program=hostname
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_APP) && make install
 
        cd $(DIR_APP) && cp -v src/su $(TOOLS_DIR)/bin/su-tools
-
-       @$(POST_INSTALL)
+endef
index bebd7915cf243b2dd18b6cb1b7219342d2b2d198..35c798484d499bfe2385621f7a9aed9af266922d 100644 (file)
@@ -1,14 +1,11 @@
 
 include ../../core/cpio/cpio.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \
                        --prefix=$(TOOLS_DIR)
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-
-       @$(POST_BUILD)
+endef
index 83773079c0385bf4c9e86bb95e72d31c65701520..9678fd8696d893a5f4aebaa19553df8ac5800384 100644 (file)
@@ -1,14 +1,11 @@
 
 include ../../core/diffutils/diffutils.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \
                        --prefix=$(TOOLS_DIR)
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-
-       @$(POST_BUILD)
+endef
index dae1d5fe8f1ce89192b8438a27c64edaf05ddbba..4b7b57dba7c513881a2d70bacc6520dfc6d28f09 100644 (file)
@@ -1,9 +1,7 @@
 
 include ../../core/e2fsprogs/e2fsprogs.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP)/build && \
                ../configure \
                        $(CONFIGURE_ARCH) \
@@ -11,13 +9,8 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --enable-elf-shlibs
 
        cd $(DIR_APP)/build && make $(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_APP)/build && make install-libs
-
-       @$(POST_INSTALL)
+endef
index 7ff0adace661bd9ebf66b7284ead3a1ab22e69cf..8a88473c0bd5b96c9620e350d9337806e9c6a6b6 100644 (file)
@@ -1,9 +1,7 @@
 
 include ../../core/file/file.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \
@@ -11,13 +9,8 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --disable-static
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_APP) && make install
-
-       @$(POST_INSTALL)
+endef
index 9a2b75cc44d21233707d7e16f56516ccdf6480c3..da4d8b48086456d1f617e0e9d2da72fbf1692a62 100644 (file)
@@ -1,9 +1,7 @@
 
 include ../../core/findutils/findutils.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \
@@ -11,13 +9,8 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --libexecdir=$(TOOLS_DIR)/lib/findutils
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_APP) && make install
-
-       @$(POST_INSTALL)
+endef
index 5dc0aad6aacfbca1c146138225ec9bd27f03f403..ac7f5ba9cca2292a2e082c88639c13fff49cef6b 100644 (file)
@@ -1,9 +1,7 @@
 
 include ../../core/flex/flex.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \
@@ -11,13 +9,8 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --disable-static
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_APP) && make install
-
-       @$(POST_INSTALL)
+endef
index b90eb5194833b1d532d98cfb05779e942b645d57..960429eb2c2cd7717c50604bcaef2999af444092 100644 (file)
@@ -1,9 +1,7 @@
 
 include ../../core/gawk/gawk.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ac_cv_func_working_mktime=yes \
                ./configure \
@@ -15,5 +13,4 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
        cd $(DIR_APP) && echo "#define HAVE_LC_MESSAGES 1" >> config.h
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-
-       @$(POST_BUILD)
+endef
index 0078740c6a13afea29b209f207a0850b3dde40b6..adc126f55b9ed8205404b32e5bb3959ab7b485ff 100644 (file)
@@ -3,9 +3,7 @@ PKG_TOOLCHAIN_DEPS += binutils-static kernel-headers
 
 include ../../core/gcc/gcc.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-       
+define STAGE_BUILD
        ## Enable -fPIC by default
        cd $(DIR_APP) && sed 's/^\(#define CC1_SPEC.*\)\("\)$$/\1 %{fno-pic|fpic|fPIC:;:-fPIC}\2/' \
                -i gcc/config/i386/linux.h
@@ -16,8 +14,6 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
        # functions in libssp, linking to libssp will cause conflicts with libc, so 
        # libssp is a waste of space... so --disable-libssp. 
 
-       set
-
        cd $(DIR_SRC)/gcc-build && \
                CC="gcc -B/usr/bin/" \
                ../$(THISAPP)/configure \
@@ -36,13 +32,9 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        $(CONFIGURE_ARGS)
 
        cd $(DIR_SRC)/gcc-build && make $(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_SRC)/gcc-build && make install
 
        ln -fvs gcc $(TOOLS_DIR)/bin/cc
@@ -50,5 +42,4 @@ $(STAGE_INSTALL): $(STAGE_BUILD)
        $(TARGET)-gcc -dumpspecs | sed \
                -e 's@$(LINKER)@$(TOOLS_DIR)&@g' \
                > $$(dirname $$($(TARGET)-gcc -print-libgcc-file-name))/specs
-
-       @$(POST_INSTALL)
+endef
index da2eaeee6a030c66bae59f15101847c7bfb12865..a776a5ef3943646d36c0b878a124f35d808cca98 100644 (file)
@@ -3,9 +3,7 @@ PKG_TOOLCHAIN_DEPS += binutils glibc
 
 include ../gcc-static/gcc-static.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        # Enable hardening by default:
        cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-espf-1.patch
 
@@ -58,12 +56,8 @@ endif
                        $(CONFIGURE_ARGS)
 
        cd $(DIR_SRC)/gcc-build && make $(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_SRC)/gcc-build && make install
-
-       @$(POST_INSTALL)
+endef
index 4f089f91f196f06d2fca2369f6d4754a4ad987f0..2135e1b1d74b1ec1f9d32a4b999c9e588f292a75 100644 (file)
@@ -1,9 +1,7 @@
 
 include ../../core/gettext/gettext.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP)/gettext-tools && \
                ./configure \
                        $(CONFIGURE_ARCH) \
@@ -12,13 +10,8 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
 
        cd $(DIR_APP)/gettext-tools && make -C gnulib-lib
        cd $(DIR_APP)/gettext-tools && make -C src msgfmt
+endef
 
-       @$(POST_BUILD)
-
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_APP)/gettext-tools && cp -v src/msgfmt $(TOOLS_DIR)/bin
-
-       @$(POST_INSTALL)
+endef
index 84e38319dc5f62c6dac058de05bc158dc38dcb33..9454801a324594beb14f0ae59b6ac53f7a0b6c6a 100644 (file)
@@ -3,9 +3,7 @@ PKG_TOOLCHAIN_DEPS += binutils-static gcc-static kernel-headers
 
 include ../../core/glibc/glibc.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        # Glibc uses a hard coded path for /etc/ld.so.preload. To keep Glibc from
        # preloading libraries from the host machine perform the following command:
        cd $(DIR_APP) && sed -e "s@/etc/ld.so.preload@$(TOOLS_DIR)@" -i elf/rtld.c
@@ -44,16 +42,11 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
        echo "CXXFLAGS = $(CXXFLAGS)" >> $(DIR_SRC)/glibc-build/configparms
        cd $(DIR_SRC)/glibc-build && make PARALLELMFLAGS=$(PARALLELISMFLAGS) \
                CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
+endef
 
-       @$(POST_BUILD)
-
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        -mkdir -v $(TOOLS_DIR)/etc
        touch $(TOOLS_DIR)/etc/ld.so.conf
 
        cd $(DIR_SRC)/glibc-build && make install
-
-       @$(POST_INSTALL)
+endef
index 4b60842e4c8abe4e078d3a84bf81df0bfcd6cfd9..5a4393d9153bb816d0de50b9c2679cb5bec5ee85 100644 (file)
@@ -1,9 +1,7 @@
 
 include ../../core/grep/grep.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \
@@ -12,5 +10,4 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --without-included-regex
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-
-       @$(POST_BUILD)
+endef
index 1fad026b4ea88a73fdf0853b9fdf6dee6fa52184..abcf7a13be162f4e5425b0fa7d8f7cbd6ae8fe2a 100644 (file)
@@ -1,9 +1,7 @@
 
 include ../../core/gzip/gzip.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        # NO_ASM is for textrels.
        cd $(DIR_APP) && \
                DEFS=NO_ASM \
@@ -13,13 +11,8 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --prefix=$(TOOLS_DIR)
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_APP) && make install
-
-       @$(POST_INSTALL)
+endef
index 83beb79995afc238c3b71145d6cf70221707b162..dd8cc9e21b510d1b85cbe9c4af00cc09f953bfcf 100644 (file)
@@ -3,10 +3,7 @@ PKG_TOOLCHAIN_DEPS = # Depend on nothing
 
 include ../../core/kernel-headers/kernel-headers.nm
 
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-       
+define STAGE_INSTALL
        cd $(DIR_APP) && make ARCH=x86 INSTALL_HDR_PATH=dest headers_install
        cd $(DIR_APP) && cp -rv dest/include/* $(TOOLS_DIR)/include
-
-       @$(POST_INSTALL)
+endef
index a579dfa7b8bfd7a6fda5823fc72f2fe6fd9d1769..df66dcc9461bd13449666cb3c0ede727cb192e6b 100644 (file)
@@ -1,9 +1,7 @@
 
 include ../../core/m4/m4.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                CPPFLAGS="-D_GNU_SOURCE" \
                gl_cv_func_printf_directive_n=no \
@@ -12,5 +10,4 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --prefix=$(TOOLS_DIR)
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-
-       @$(POST_BUILD)
+endef
index 206f1c53f8f1e53a3e52431f2c7ee0a748621868..bc8aec5b722edde82872f9b0a0bdd262d16c0a33 100644 (file)
@@ -1,14 +1,11 @@
 
 include ../../core/make/make.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_INSTALL
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \
                        --prefix=$(TOOLS_DIR)
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-
-       @$(POST_BUILD)
+endef
index a7375e630ac955e74c68969e320171ad8dd9ed33..1bb2daf68e53c6322462d984cbc3e8f9dcfe228e 100644 (file)
@@ -1,9 +1,7 @@
 
 include ../../core/ncurses/ncurses.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \
@@ -19,17 +17,12 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --disable-static
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-       
-       @$(POST_BUILD)
-
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
+endef
 
+define STAGE_INSTALL
        cd $(DIR_APP) && make install
        for lib in curses ncurses form panel menu; do \
                rm -vf $(TOOLS_DIR)/lib/lib$${lib}.so ; \
                echo "INPUT(-l$${lib}w)" >$(TOOLS_DIR)/lib/lib$${lib}.so ; \
        done
-       
-       @$(POST_INSTALL)
+endef
index 253f848d53e4140ede75bbd49fa83f4ca3cf4d10..8b1a16a631f4f73972ba0f48a8271ea6e703ca2c 100644 (file)
@@ -1,14 +1,11 @@
 
 include ../../core/patch/patch.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \
                        --prefix=$(TOOLS_DIR)
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-
-       @$(POST_BUILD)
+endef
index aec2eb16d3757befda5629b658defa3e86e631c5..d46190a8e08fc754ce08c5965a9888d762f7ffe1 100644 (file)
@@ -1,17 +1,10 @@
 
 include ../../core/pax-utils/pax-utils.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && make scanelf CFLAGS="$(CFLAGS)" $(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_APP) && install -m 755 -v scanelf $(TOOLS_DIR)/bin/scanelf
-
-       @$(POST_INSTALL)
+endef
index 2f403445ed72fb8ca239d5ed330c0811773a6386..807d45e5b1ed5432d938abdc5f13d35e59a10e61 100644 (file)
@@ -1,9 +1,7 @@
 
 include ../../core/perl/perl.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        -mkdir -pv $(DIR_SRC)/perl-build
 
        # -Dlibc, locincpth, loclibpth, glibpth, and usrinc, are equivilent to the LFS
@@ -26,13 +24,8 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        -d -e
 
        cd $(DIR_SRC)/perl-build && make #$(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_SRC)/perl-build && make LNS="cp" install
-
-       @$(POST_INSTALL)
+endef
index 1bf14621f1d1923031237ef6c58bb9ee5cb5554c..e21e25fe3845773b19174e14b1f68a43e71e1976 100644 (file)
@@ -1,9 +1,7 @@
 
 include ../../core/sed/sed.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \
@@ -11,5 +9,4 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --without-included-regex
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-
-       @$(POST_BUILD)
+endef
index c253c97f2f16df8ffc641c607650073f69f31b71..cb56f76e88cc0ff50f1c25b90889b4caf106d984 100644 (file)
@@ -1,15 +1,13 @@
 
 include ../../core/tar/tar.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        # Normally the 'rmt' programs goes in sbin/.
        cd $(DIR_APP) && LDFLAGS="-z muldefs" \
                ./configure \
                        $(CONFIGURE_ARCH) \
                        --prefix=$(TOOLS_DIR) \
                        --libexecdir=$(TOOLS_DIR)/bin
-       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
 
-       @$(POST_BUILD)
+       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+endef
index a7099a915136a473a6722fe065779875ab3c3439..52efdeea48f789660b0c29cf66becc616b5901da 100644 (file)
@@ -3,9 +3,7 @@ PKG_TOOLCHAIN_DEPS += $(TC_PACKAGES) ncurses
 
 include ../../core/texinfo/texinfo.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                LDFLAGS="-lncursesw" \
                ./configure \
@@ -13,5 +11,4 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --prefix=$(TOOLS_DIR)
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-
-       @$(POST_BUILD)
+endef
index 5384794efbca5f7337052ec675c3f142ea530f0f..e28024d6270b7378111d63925a74d5a6422ee18c 100644 (file)
@@ -1,9 +1,7 @@
 
 include ../../core/xz/xz.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \
@@ -11,13 +9,8 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --disable-static
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_INSTALL
        cd $(DIR_APP) && make install
-
-       @$(POST_INSTALL)
+endef
index 1c5ec9c749bec0f4da33c34715005f2db7c16931..ae72672d9515a3aa63350cfd21ec9bcb75157348 100644 (file)
@@ -1,9 +1,7 @@
 
 include ../../core/zlib/zlib.nm
 
-$(STAGE_BUILD): $(STAGE_PREPARE)
-       @$(PRE_BUILD)
-
+define STAGE_BUILD
        cd $(DIR_APP) && sed -e "s/^AC_PROG_CXX$$//g" -i configure.ac
        cd $(DIR_APP) && autoreconf --install --force
        cd $(DIR_APP) && \
@@ -14,12 +12,8 @@ $(STAGE_BUILD): $(STAGE_PREPARE)
                        --disable-static
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+endef
 
-       @$(POST_BUILD)
-
-$(STAGE_INSTALL): $(STAGE_BUILD)
-       @$(PRE_INSTALL)
-
+define STAGE_BUILD
        cd $(DIR_APP) && make install
-
-       @$(POST_INSTALL)
+endef
index 2622e95b07775e1b371cf91e08b129df4a740c3e..091068d58fdacdac2fc3dbc6bfcc1e1dd1560057 100644 (file)
@@ -15,7 +15,11 @@ HOSTNAME=$(</proc/sys/kernel/hostname)
 MACHINE=$(uname -m)
 
 NAOKI=${BASEDIR}/tools/naoki
+DOWNLOADER=${BASEDIR}/tools/downloader
 
+DIR_CACHE=${BASEDIR}/cache
 DIR_LOGS=${BASEDIR}/logs
 DIR_PACKAGES=${BASEDIR}/packages
+DIR_PATCHES=${DIR_CACHE}/patches
 DIR_PKGS=${BASEDIR}/pkgs
+DIR_TARBALLS=${DIR_CACHE}/tarballs
index c6bb4f89f9c2dfd66af1f4efc2c71795ef6729be..f6c457a07d6184c6d5c0d625c81fea5abedce29b 100644 (file)
@@ -13,6 +13,18 @@ function listmatch() {
        return 1
 }
 
+function listremove() {
+       local arg=${1}
+       shift
+
+       local value
+       for value in $@; do
+               if [ "${arg}" != "${value}" ]; then
+                       echo "${value}"
+               fi
+       done | tr "\n" " "
+}
+
 function is_package() {
        local package=$(find_package ${1})
 
@@ -153,12 +165,25 @@ function package_summary() {
 }
 
 function package_runtime_dependencies() {
+       local recursive=0
+       if [ "${1}" = "--recursive" ]; then
+               recursive=1
+               shift
+       fi
+
+       local ret
        local package
        for package in $(package_get ${1} PKG_DEPENDENCIES); do
                package=$(find_package ${package})
-               echo "${package}"
+               ret="${ret} ${package}"
                log DEBUG "  Got runtime dep: ${package}"
        done
+
+       if [ "${recursive}" = "1" ]; then
+               package_recursive_dependencies package_runtime_dependencies ${ret}
+       else
+               echo ${ret}
+       fi
 }
 
 function package_build_dependencies() {
@@ -171,12 +196,25 @@ function package_build_dependencies() {
 }
 
 function package_toolchain_dependencies() {
+       local recursive=0
+       if [ "${1}" = "--recursive" ]; then
+               recursive=1
+               shift
+       fi
+
+       local ret
        local package
        for package in $(package_get ${1} PKG_TOOLCHAIN_DEPS); do
                package=$(find_package ${package})
-               echo "${package}"
+               ret="${ret} ${package}"
                log DEBUG "  Got toolchain dep: ${package}"
        done
+
+       if [ "${recursive}" = "1" ]; then
+               package_recursive_dependencies package_toolchain_dependencies ${ret}
+       else
+               echo ${ret}
+       fi
 }
 
 function package_dependencies() {
@@ -188,6 +226,41 @@ function package_dependencies() {
        fi
 }
 
+function package_recursive_dependencies() {
+       local func=${1}
+       shift
+
+       local to_check=$@
+       local checked
+       while true; do
+               if [ -z "${to_check}" ]; then
+                       break
+               fi
+
+               local i
+               for i in ${to_check}; do
+                       if ! listmatch ${i} ${to_check}; then
+                               to_check="${to_check} $(${func} ${i})"
+                       fi
+                       checked="${checked} ${i}"
+                       to_check="$(listremove ${i} ${to_check})"
+               done
+       done
+       echo ${checked}
+}
+
+function package_dependencies_for_build() {
+       local p=$(find_package ${1})
+
+       local i
+       local ret="$(package_dependencies ${p})"
+       for i in ${ret}; do
+               ret="${ret} $(package_runtime_dependencies --recursive ${i})"
+       done
+
+       echo ${ret}
+}
+
 function package_packages() {
        package_get ${1} PKG_PACKAGES_FILES
 }
@@ -204,16 +277,20 @@ function package_license() {
        package_get ${1} PKG_LICENSE
 }
 
-function package_extract_dependencies() {
-       local package=$(find_package ${1})
-       local to_extract="${PACKAGES_TO_EXTRACT}"
-       
-       local dep
-       for dep in $(dependencies_resolve ${PACKAGES_TO_EXTRACT} ${package}); do
-               echo ${dep}
-       done
+function package_objects() {
+       package_get ${1} PKG_OBJECTS
 }
 
+#function package_extract_dependencies() {
+#      local package=$(find_package ${1})
+#      local to_extract="${PACKAGES_TO_EXTRACT}"
+#      
+#      local dep
+#      for dep in $(dependencies_resolve ${PACKAGES_TO_EXTRACT} ${package}); do
+#              echo ${dep}
+#      done
+#}
+
 function package_is_built() {
        local package=$(find_package ${1})
 
@@ -226,29 +303,32 @@ function package_is_built() {
        return 0
 }
 
-function dependencies_resolve() {
-       local dependencies
-       local package
-       local ret
-
-       for package in $@; do
-               log DEBUG "Resolving dependencies for ${package}..."
-
-               dependencies="$(package_build_dependencies ${package})"
-               dependencies="${dependencies} $(package_dependencies ${package})"
-
-               if [ "${dependencies}" != " " ]; then
-                       log DEBUG "    Got: ${dependencies}"
-               fi
-
-               ret="${ret} ${dependencies} $(dependencies_resolve ${dependencies})"
-       done
-       
-       # Sort and unique the package list
-       for package in ${ret}; do
-               echo "${package}"
-       done | sort -u
-}
+#function dependencies_resolve() {
+#      local dependencies
+#      local package
+#      local ret
+#
+#      for package in $@; do
+#              log DEBUG "Resolving dependencies for ${package}..."
+#
+#              dependencies=$(package_dependencies ${package})
+#
+#              if [ -n "${dependencies}" ]; then
+#                      log DEBUG "  Got: ${dependencies}"
+#
+#                      for dep in ${dependencies}; do
+#                              if ! listmatch ${dep} ${ret}; then
+#                                      ret="${ret} ${dep} $(dependencies_resolve ${dep})"
+#                              fi
+#                      done
+#              fi
+#      done
+#
+#      # Sort and unique the package list
+#      for package in ${ret}; do
+#              echo "${package}"
+#      done | sort -u
+#}
 
 function package_sort() {
        local pkg
index 480fa0f4eca85002f63b7916ed8c549646667e40..b0934e66249f4c2c8cde59fe8c89fd3a3e24d0af 100644 (file)
@@ -9,7 +9,7 @@ ARCH=i686
 PACKAGES_TO_EXTRACT="coreutils filesystem perl util-linux-ng"
 
 PACKAGES_PARALLELISM=2
-PARALLELISMFLAGS=-j5
+PARALLELISMFLAGS=-j1
 
 CFLAGS="-fomit-frame-pointer -pipe"
 case "${ARCH}" in
index 91c72ddb64b7d7a71c4b963ae5fe648b4ee995bb..08c96bfbc1ad99ea15456195e34c9f298cb8cd56 100644 (file)
@@ -19,8 +19,8 @@ function exithandler() {
                done <<<"${mounts}"
        done
 
-       if [ "${ERROR}" != "1" ]; then
-               [ -d "${BUILD_DIR}" ] && rm -rf ${BUILD_DIR}
+       if [ ! -e "${BUILD_DIR}/.failed" ]; then
+               rm -rf ${BUILD_DIR}
        fi
 
        log DEBUG "Shut down naoki instance with pid $$."
@@ -60,13 +60,11 @@ function naoki_prepare() {
        local p=$(find_package ${1})
        shift
 
-
-
        msg "Preparing environment ${BUILD_DIR}..."
 
        mkdir -p \
                ${BUILD_DIR} \
-               ${BUILD_DIR}/{root,tmp} \
+               ${BUILD_DIR}/{boot,root,tmp} \
                ${BUILD_DIR}/{dev,proc,sys} \
                ${BUILD_DIR}/{,usr/}{bin,lib,sbin} \
                ${BUILD_DIR}/usr/src \
@@ -85,18 +83,38 @@ function naoki_prepare() {
                mount --bind /${i} ${BUILD_DIR}/${i}
        done
 
-       CHROOT=0 naoki_make ${p} --without-chroot download
+       local object
+       local to_download
+       for object in $(package_objects ${p}); do
+               if [ -e "${DIR_TARBALLS}/${object}" ] || \
+                       [ -e "${DIR_PATCHES}/${object}" ]; then
+                       continue
+               fi
+               to_download="${to_download} ${object}"
+       done
+       if [ -n "${to_download}" ]; then
+               log DEBUG "Going to get file(s): ${to_download}"
+               ${DOWNLOADER} --tarballs="${DIR_TARBALLS}" \
+                       --patches="${DIR_PATCHES}" ${to_download}
+               if [ "$?" != "0" ]; then
+                       return 1
+               fi
+       fi
 
        # Extract needed packages
-       local pkg_dependencies=$(dependencies_resolve ${p} | tr "\n" " ")
+       local pkg_dependencies=$(package_dependencies_for_build ${p})
        msg "  Resolving dependencies: ${pkg_dependencies-None}"
        local dep
+       local missing
        for dep in ${pkg_dependencies}; do
                if ! package_is_built ${dep}; then
-                       msg "Dependencies for ${p} are missing. Cannot prepare."
-                       return 4
+                       missing="${missing} ${dep}"
                fi
        done
+       if [ -n "${missing}" ]; then
+               msg "Dependencies for ${p} are missing: ${missing}"
+               return 4
+       fi
 
        for dep in ${pkg_dependencies}; do
                msg "Decompressing ${dep}..."
@@ -111,8 +129,7 @@ function naoki_prepare() {
                ln -sf ${TOOLS_DIR}${i} ${BUILD_DIR}${i}
        done
 
-       naoki_make ${p} prepare $@
-       return $?
+       return 0
 }
 
 function naoki_cleanup() {
@@ -219,20 +236,10 @@ function naoki_make() {
        fi
        cmd="${cmd} -f ${p##*/}.nm"
 
-       naoki_cmd ${p} "${cmd}" $@ 2>&1 | __erase_log
+       naoki_cmd ${p} "${cmd}" $@
        return ${PIPESTATUS[0]}
 }
 
-function __erase_log() {
-       local line
-
-       local IFS='\n'
-       while read line; do
-               grep -q "commands for target" <<<"${line}" && continue
-               echo -e "${line}"
-       done
-}
-
 function naoki_build() {
        local p=$(find_package ${1})
        shift
@@ -248,27 +255,12 @@ function naoki_build() {
                exit ${ret}
        fi
 
-       naoki_make ${p} build $@
-       ret=$?
-
-       if [  "${ret}" != "0" ]; then
-               error "Build command failed."
-               exit ${ret}
-       fi
-       
-       naoki_make ${p} install $@
-       ret=$?
-
-       if [  "${ret}" != "0" ]; then
-               error "Install command failed."
-               exit ${ret}
-       fi
-
        naoki_make ${p} package $@
        ret=$?
 
        if [  "${ret}" != "0" ]; then
-               error "Package command failed."
+               error "Package build failed."
+               touch ${BUILD_DIR}/.failed
                exit ${ret}
        fi
 }
@@ -290,6 +282,7 @@ function naoki_shell() {
        shift
 
        naoki_prepare ${p}
+       naoki_make ${p} shell
 
        # A little help message
        echo
@@ -306,7 +299,7 @@ function naoki_shell() {
 
        naoki_cmd ${p} "bash --login"
        local ret=$?
-       
+
        echo
        echo    "Exit code: ${ret}"
        echo
diff --git a/tools/quality-agent.d/001-include-files b/tools/quality-agent.d/001-include-files
new file mode 100644 (file)
index 0000000..596194d
--- /dev/null
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+. $(dirname ${0})/qa-include
+
+# Fix include files
+echo "${0##*/}: Fix include files"
+
+if [ ! -d "${BUILDROOT}/usr/include" ]; then
+       exit 0
+fi
+
+chown -R root:root ${BUILDROOT}/usr/include