I forgot to change the stage name in the lfs-scripts.

diff --git a/lfs/adjust-toolchain b/lfs/adjust-toolchain
index 4c8384a1454bae8d5a72f7917e56d65dbcfcefb7..551e95658ad95fef64eddffbeb24d429750e6508 100644 (file)
--- a/lfs/adjust-toolchain
+++ b/lfs/adjust-toolchain
@@ -77,7 +77,7 @@ ifeq "$(STAGE)" "base"
                `dirname $$(gcc --print-libgcc-file-name)`/specs
 endif
 
-ifeq "$(STAGE)" "uclibc"
+ifeq "$(STAGE)" "installer"
        #$(UCLIBC_TARGET)-gcc -dumpspecs \
        #       > $$($(UCLIBC_TARGET)-gcc --print-file specs)
        #sed -e 's/%{shared:-lc}/%{!nointl: -lintl} &/' \

diff --git a/lfs/binutils b/lfs/binutils
index 6105bb6b0398a5e32c98ed49869dcd7b09e6b8c4..cfed808fb41ddc4db49fa7e57e118bcbc04c687c 100644 (file)
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -145,7 +145,7 @@ ifeq "$(STAGE)" "base"
        cp -fv ../$(THISAPP)/include/libiberty.h /usr/include
 endif
 
-ifeq "$(STAGE)" "uclibc"
+ifeq "$(STAGE)" "installer"
        cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-uClibc-1.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-ld_makefile.patch
        cd $(DIR_SRC)/binutils-build && ../$(THISAPP)/configure \

diff --git a/lfs/cpio b/lfs/cpio
index 55d86c974643a74b71f458689d27cf66e5627657..1295995d7bce383373588ec23cbd87cf67d37145 100644 (file)
--- a/lfs/cpio
+++ b/lfs/cpio
@@ -62,7 +62,7 @@ ifeq "$(STAGE)" "ipfire"
        cd $(DIR_APP) && make install
 endif
 
-ifeq "$(STAGE)" "uclibc"
+ifeq "$(STAGE)" "installer"
        cd $(DIR_APP) && ./configure CPIO_MT_PROG=mt --prefix=/usr \
                                --bindir=/bin --libexecdir=/tmp \
                                --with-rmt=/usr/sbin/rmt \

diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs
index 0fbdf0c6f59c5b2ca1af17426eb53d4b590f4aa9..70fabcecaaa82439bbcff0331409e58b96f0d216 100644 (file)
--- a/lfs/e2fsprogs
+++ b/lfs/e2fsprogs
@@ -72,7 +72,7 @@ ifeq "$(STAGE)" "base"
        cd $(DIR_APP)/build && make install-libs
 endif
 
-ifeq "$(STAGE)" "uclibc"
+ifeq "$(STAGE)" "installer"
        cd $(DIR_APP)/build && ../configure --prefix=/usr \
                                                --with-root-prefix="" \
                                                --enable-elf-shlibs \

diff --git a/lfs/gcc b/lfs/gcc
index dbf9c5d9a9c8edefeae669da7cbbde8cbd7fc19b..dd31132971142bd882a5e38b1d68043045e5005d 100644 (file)
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -40,7 +40,7 @@ else
        TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)-cross$(PASS)
 endif
 else
-ifeq "$(STAGE)" "uclibc"
+ifeq "$(STAGE)" "installer"
        TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)-pass$(PASS)
 else
        TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
@@ -234,7 +234,7 @@ ifeq "$(STAGE)" "base"
        ln -sfv gcc /usr/bin/cc 
 endif
 
-ifeq "$(STAGE)" "uclibc"
+ifeq "$(STAGE)" "installer"
        cd $(DIR_APP) && patch -p1 -i $(DIR_PATCHES)/$(THISAPP)-uClibc-conf-1.conf
        sed -e "s@/lib/ld-uClibc.so.0@$(UCLIBC_LINKER)@g" -i $(DIR_APP)/gcc/config/linux.h
        echo -e "\n#undef STARTFILE_PREFIX_SPEC\n#define STARTFILE_PREFIX_SPEC \"$(UCLIBC_DIR)/lib/\"" \

diff --git a/lfs/gettext b/lfs/gettext
index 3cf1e5e7ced59469fc02de94cb8f51d4f6392464..84d3f65e29494ef1b76bbc9f5906fd46054d7dc2 100644 (file)
--- a/lfs/gettext
+++ b/lfs/gettext
@@ -31,7 +31,7 @@ THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
-ifeq "$(STAGE)" "uclibc"
+ifeq "$(STAGE)" "installer"
        TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)-pass$(PASS)
 else
        TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
@@ -71,7 +71,7 @@ ifeq "$(STAGE)" "base"
        cd $(DIR_APP) && make install
 endif
 
-ifeq "$(STAGE)" "uclibc" # Do this in pass 1 and 2
+ifeq "$(STAGE)" "installer" # Do this in pass 1 and 2
        cd $(DIR_APP)/gettext-runtime && CC=$(UCLIBC_TARGET)-gcc ./configure \
                                                --prefix=$(UCLIBC_DIR) \
                                                --host=$(UCLIBC_TARGET) \

diff --git a/lfs/kudzu b/lfs/kudzu
index 18cd20473fa4e1de39dfcb0ad96213504499269f..c5651675eb5c6a9ec84d25ec3e1ded40314ad85f 100644 (file)
--- a/lfs/kudzu
+++ b/lfs/kudzu
@@ -60,7 +60,7 @@ ifeq "$(STAGE)" "ipfire"
        cd $(DIR_APP) && ARCH=$(MACHINE) RPM_OPT_FLAGS="$(CFLAGS)" make install-program
 endif
 
-ifeq "$(STAGE)" "uclibc"
+ifeq "$(STAGE)" "installer"
        cd $(DIR_APP) && sed -e "s/^AR = ar//" -e "s/^RANLIB = ranlib//" \
                -i Makefile
        cd $(DIR_APP) && sed -e "s@ln -s ../../sbin/kudzu \$$(usbindir)/kudzu@@" \

diff --git a/lfs/linux b/lfs/linux
index 74fbbebd31b7fbef0f4c86a8f1ffc4e6f281430f..5d6afbb71dd151b7d27c9519aa774f0e595cbe8d 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -146,7 +146,7 @@ ifeq "$(STAGE)" "ipfire"
        ln -svf System.map-$(FULLVER) /boot/System.map
 endif
 
-ifeq "$(STAGE)" "uclibc"
+ifeq "$(STAGE)" "installer"
        cd $(DIR_APP) && make mrproper
        cd $(DIR_APP) && make ARCH=x86 headers_check
        cd $(DIR_APP) && make ARCH=x86 INSTALL_HDR_PATH=dest headers_install

diff --git a/lfs/lzma b/lfs/lzma
index 506b2fd0fde33c118f7f7b6e703634ae9da9c0a0..54b2a2ce6138d1d382bed5375476f434fdc684ef 100644 (file)
--- a/lfs/lzma
+++ b/lfs/lzma
@@ -64,7 +64,7 @@ ifeq "$(STAGE)" "ipfire"
                /usr/bin/lzma_sdk
 endif
 
-ifeq "$(STAGE)" "uclibc"
+ifeq "$(STAGE)" "installer"
        cd $(DIR_APP) && make -C CPP/7zip/Compress/LZMA_Alone \
                -f makefile.gcc -j $(PARALLELISM) \
                CXX="$(UCLIBC_TARGET)-g++ $(CXXFLAGS)" \

diff --git a/lfs/ncurses b/lfs/ncurses
index f2ace9077c738bd04996acd7bd599d7b482a323f..9b246f076d0dbbd9e8673fa791e72dc263cd307b 100644 (file)
--- a/lfs/ncurses
+++ b/lfs/ncurses
@@ -86,7 +86,7 @@ ifeq "$(STAGE)" "base"
        ln -sfv libncurses.a /usr/lib/libcurses.a
 endif
 
-ifeq "$(STAGE)" "uclibc"
+ifeq "$(STAGE)" "installer"
        cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-coverity_fixes-1.patch
        cd $(DIR_APP) && ./configure --prefix=/usr \
                                                --build=$(IFS_TARGET) \

diff --git a/lfs/newt b/lfs/newt
index 21aee164a81383c3e0fe261c89dd26685b187790..ad6035120b2098a8abd3f5bb74a63ea6e4aabc15 100644 (file)
--- a/lfs/newt
+++ b/lfs/newt
@@ -63,7 +63,7 @@ ifeq "$(STAGE)" "ipfire"
        cd $(DIR_APP) && make install
 endif
 
-ifeq "$(STAGE)" "uclibc"
+ifeq "$(STAGE)" "installer"
        cd $(DIR_APP) && ./configure --prefix=$(UCLIBC_DIR)/usr \
                                                        --without-gpm-support \
                                                        --without-tcl \

diff --git a/lfs/parted b/lfs/parted
index 04da6c68fd7c76eab0ec1707e01e6b605e8df446..193b9c8f46dc349081d3b0221c0438db3a81a6e9 100644 (file)
--- a/lfs/parted
+++ b/lfs/parted
@@ -69,7 +69,7 @@ ifeq "$(STAGE)" "ipfire"
        cd $(DIR_APP) && make install
 endif
 
-ifeq "$(STAGE)" "uclibc"
+ifeq "$(STAGE)" "installer"
        cd $(DIR_APP) && ./configure --prefix=/usr \
                                                --build=$(IFS_TARGET) \
                                                --host=$(UCLIBC_TARGET) \

diff --git a/lfs/pciutils b/lfs/pciutils
index 3f54d70c8053206cbea4278722d803bece27807a..304648d876d80a7e4f5644b4cff433a82f09131d 100644 (file)
--- a/lfs/pciutils
+++ b/lfs/pciutils
@@ -65,7 +65,7 @@ ifeq "$(STAGE)" "ipfire"
        cd $(DIR_APP) && install -v -m 644 lib/*.h /usr/include/pci
 endif
 
-ifeq "$(STAGE)" "uclibc"
+ifeq "$(STAGE)" "installer"
        cd $(DIR_APP) && sed -e "s/^\tar/\t$(UCLIBC_TARGET)-ar/" \
                -e "s/^\tranlib/\t$(UCLIBC_TARGET)-ranlib/" -i lib/Makefile
        cd $(DIR_APP)/lib && ./configure /usr/share $(VER) $(UCLIBC_TARGET) $(KVER)

diff --git a/lfs/pcre b/lfs/pcre
index 5d1a4de243756fa23b11c5ffef5d11105e530f83..fa8d7c2ea7eacf190b2a4492854c81e27a6901de 100644 (file)
--- a/lfs/pcre
+++ b/lfs/pcre
@@ -67,7 +67,7 @@ ifeq "$(STAGE)" "ipfire"
        ln -v -sf ../../lib/libpcre.so.0 /usr/lib/libpcre.so
 endif
 
-ifeq "$(STAGE)" "uclibc"
+ifeq "$(STAGE)" "installer"
        cd $(DIR_APP) && ./configure --prefix=/usr \
                                                --enable-utf8 \
                                                --build=$(IFS_TARGET) \

diff --git a/lfs/popt b/lfs/popt
index 4064f272c4b8c3600681f2cb27315796d713ef49..7bbae2f6b051848558da926f5145f86882bcc2a7 100644 (file)
--- a/lfs/popt
+++ b/lfs/popt
@@ -61,7 +61,7 @@ ifeq "$(STAGE)" "ipfire"
        cd $(DIR_APP) && make install
 endif
 
-ifeq "$(STAGE)" "uclibc"
+ifeq "$(STAGE)" "installer"
        cd $(DIR_APP) && \
                CC=$(UCLIBC_TARGET)-gcc \
                AR=$(UCLIBC_TARGET)-ar \

diff --git a/lfs/python b/lfs/python
index 4c9f52f6956946bc8c78bc9a2fb513c151ee5524..150b008a4f383488b35aa9b7ad66ec0b58c07a76 100644 (file)
--- a/lfs/python
+++ b/lfs/python
@@ -65,7 +65,7 @@ ifeq "$(STAGE)" "ipfire"
        cd $(DIR_APP) && make install
 endif
 
-ifeq "$(STAGE)" "uclibc"
+ifeq "$(STAGE)" "installer"
        cd $(DIR_APP) && patch -Np0 -i $(DIR_PATCHES)/$(THISAPP)-crosscompile-1.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-crosscompile-2.patch
        cd $(DIR_APP) && ./configure

diff --git a/lfs/readline b/lfs/readline
index 186dce36909cf0169b6c6ed958bdd8c59af48cd8..f795d5beaa15008a941b490724d6e25aeed57e63 100644 (file)
--- a/lfs/readline
+++ b/lfs/readline
@@ -69,7 +69,7 @@ ifeq "$(STAGE)" "base"
        ln -sfv ../../lib/libhistory.so.5 /usr/lib/libhistory.so
 endif
 
-ifeq "$(STAGE)" "uclibc"
+ifeq "$(STAGE)" "installer"
        cd $(DIR_APP) && \
                CC=$(UCLIBC_TARGET)-gcc \
                AR=$(UCLIBC_TARGET)-ar \

diff --git a/lfs/slang b/lfs/slang
index e2e34a2bb957ceeb2975e42d3c1773912b080d45..2892f468e819d9391e444c8211d366befe697c64 100644 (file)
--- a/lfs/slang
+++ b/lfs/slang
@@ -62,7 +62,7 @@ ifeq "$(STAGE)" "ipfire"
        chmod -v 755 /usr/lib/libslang.so.$(VER) /usr/lib/slang/v2/modules/*.so
 endif
 
-ifeq "$(STAGE)" "uclibc"
+ifeq "$(STAGE)" "installer"
        cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/$(THISAPP)-uclibc-1.patch
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
                                                --with-png=no \

diff --git a/lfs/strip b/lfs/strip
index ae116dadeb50203f27ffc0217a4a063ba4cb5587..575ac5c1bdcd88d618d828ef2702999c84878eb6 100644 (file)
--- a/lfs/strip
+++ b/lfs/strip
@@ -51,7 +51,7 @@ ifeq "$(STAGE)" "toolchain"
        chown -R root:root $(LFS)$(TOOLS_DIR)
 endif
 
-ifeq "$(STAGE)" "uclibc"
+ifeq "$(STAGE)" "installer"
        -$(TOOLS_DIR)/bin/find $(UCLIBC_DIR)/{bin,sbin,lib} \
                -type f -exec $(TOOLS_DIR)/bin/strip --strip-all '{}' ';' \
                &>/dev/null

diff --git a/lfs/udev b/lfs/udev
index 565f51962e281445bfb4573e9742d38ee761e63d..f52270e3ae0a8ab7521374a1d5202ac3238dd18c 100644 (file)
--- a/lfs/udev
+++ b/lfs/udev
@@ -76,7 +76,7 @@ ifeq "$(STAGE)" "base"
        cd $(DIR_APP)/$(PKG_NAME)-config-$(CONFVER) && make install
 endif
 
-ifeq "$(STAGE)" "uclibc"
+ifeq "$(STAGE)" "installer"
        install -dv $(UCLIBC_DIR)/lib/{firmware,udev/devices/{pts,shm}}
        -mknod -m0666 $(UCLIBC_DIR)/lib/udev/devices/null c 1 3
        ln -sfv /proc/self/fd $(UCLIBC_DIR)/lib/udev/devices/fd

diff --git a/lfs/util-linux-ng b/lfs/util-linux-ng
index d6b547873e942ff4f9e9476b436ba2f474ad1ac6..5567120a92a558d10c3d5e45ac6189ca4667dc7e 100644 (file)
--- a/lfs/util-linux-ng
+++ b/lfs/util-linux-ng
@@ -70,7 +70,7 @@ ifeq "$(STAGE)" "base"
        cd $(DIR_APP) && make install
 endif
 
-ifeq "$(STAGE)" "uclibc"
+ifeq "$(STAGE)" "installer"
        cd $(DIR_APP) && ./configure            --build=$(IFS_TARGET) \
                                                --host=$(UCLIBC_TARGET)
        cd $(DIR_APP) && make -C disk-utils mkswap -j $(PARALLELISM)

diff --git a/lfs/zlib b/lfs/zlib
index 1d47c9e05becd052d3c74265809e89572b90f667..96ac1712fa2c47db4af1d0559418d03d07540d65 100644 (file)
--- a/lfs/zlib
+++ b/lfs/zlib
@@ -72,7 +72,7 @@ ifeq "$(STAGE)" "base"
        chmod -v 644 /usr/lib/libz.a
 endif
 
-ifeq "$(STAGE)" "uclibc"
+ifeq "$(STAGE)" "installer"
        cd $(DIR_APP) && CC=$(UCLIBC_TARGET)-gcc ./configure --prefix=/usr \
                                                        --shared \
                                                        --libdir=/lib