From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 15 May 2008 19:43:35 +0000 (+0200)
Subject: I forgot to change the stage name in the lfs-scripts.
X-Git-Tag: v3.0-alpha1~1013
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=65e73e5b2f4f4f3a95220a110cf0814271a87f27;p=ipfire-3.x.git

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

diff --git a/lfs/adjust-toolchain b/lfs/adjust-toolchain
index 4c8384a14..551e95658 100644
--- 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 6105bb6b0..cfed808fb 100644
--- 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 55d86c974..1295995d7 100644
--- 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 0fbdf0c6f..70fabceca 100644
--- 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 dbf9c5d9a..dd3113297 100644
--- 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 3cf1e5e7c..84d3f65e2 100644
--- 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 18cd20473..c5651675e 100644
--- 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 74fbbebd3..5d6afbb71 100644
--- 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 506b2fd0f..54b2a2ce6 100644
--- 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 f2ace9077..9b246f076 100644
--- 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 21aee164a..ad6035120 100644
--- 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 04da6c68f..193b9c8f4 100644
--- 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 3f54d70c8..304648d87 100644
--- 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 5d1a4de24..fa8d7c2ea 100644
--- 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 4064f272c..7bbae2f6b 100644
--- 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 4c9f52f69..150b008a4 100644
--- 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 186dce369..f795d5bea 100644
--- 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 e2e34a2bb..2892f468e 100644
--- 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 ae116dade..575ac5c1b 100644
--- 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 565f51962..f52270e3a 100644
--- 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 d6b547873..5567120a9 100644
--- 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 1d47c9e05..96ac1712f 100644
--- 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