Index: BOOK/boot/common/eudev.xml
===================================================================
--- BOOK/boot/common/eudev.xml (revision 5bef7dfe172c3291f071505cd77000abb672d6ef)
+++ BOOK/boot/common/eudev.xml (revision d3a81ee2a903fb1e5c98f4f32eb31e1ab1f6d7b6)
@@ -49,5 +49,5 @@
Create a dummy rule so that Eudev will name ethernet devices properly for the system.
-echo "# dummy, so that network is once again on eth*" > \
+echo "# dummy, so that network is once again on eth*" > \
/tools/etc/udev/rules.d/80-net-name-slot.rules
Index: BOOK/boot/common/shadow.xml
===================================================================
--- BOOK/boot/common/shadow.xml (revision 5bef7dfe172c3291f071505cd77000abb672d6ef)
+++ BOOK/boot/common/shadow.xml (revision d3a81ee2a903fb1e5c98f4f32eb31e1ab1f6d7b6)
@@ -29,5 +29,5 @@
cp -v src/Makefile.in{,.orig}
sed -e 's/groups$(EXEEXT) //' -e 's/= nologin$(EXEEXT)/= /' \
- src/Makefile.in.orig > src/Makefile.in
+ src/Makefile.in.orig > src/Makefile.in
Prepare Shadow for compilation:
Index: BOOK/boot/mips/colo-build.xml
===================================================================
--- BOOK/boot/mips/colo-build.xml (revision 5bef7dfe172c3291f071505cd77000abb672d6ef)
+++ BOOK/boot/mips/colo-build.xml (revision d3a81ee2a903fb1e5c98f4f32eb31e1ab1f6d7b6)
@@ -40,5 +40,5 @@
cp -v stage2/Makefile{,.orig}
-sed '/^CFLAGS/s/-Werror //' stage2/Makefile.orig > stage2/Makefile
+sed '/^CFLAGS/s/-Werror //' stage2/Makefile.orig > stage2/Makefile
/usr/lib/libstdc++.la
+sed -e 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
ln -sv bash /bin/sh
ln -sv /run /var/run
Index: BOOK/chroot/common/createfiles.xml
===================================================================
--- BOOK/chroot/common/createfiles.xml (revision 5bef7dfe172c3291f071505cd77000abb672d6ef)
+++ BOOK/chroot/common/createfiles.xml (revision d3a81ee2a903fb1e5c98f4f32eb31e1ab1f6d7b6)
@@ -19,5 +19,5 @@
ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
ln -sv /tools/lib/libstdc++.so{.6,} /usr/lib
-sed -e 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
+sed -e 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
ln -sv bash /bin/sh
ln -sv /run /var/run
Index: BOOK/chroot/mips64/createfiles.xml
===================================================================
--- BOOK/chroot/mips64/createfiles.xml (revision 5bef7dfe172c3291f071505cd77000abb672d6ef)
+++ BOOK/chroot/mips64/createfiles.xml (revision d3a81ee2a903fb1e5c98f4f32eb31e1ab1f6d7b6)
@@ -23,5 +23,5 @@
ln -sv /tools/lib32/libstdc++.so{.6,} /usr/lib32
ln -sv /tools/lib64/libstdc++.so{.6,} /usr/lib64
-sed -e 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
+sed -e 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
ln -sv bash /bin/sh
ln -sv /run /var/run
Index: BOOK/cross-tools/common/gcc-static.xml
===================================================================
--- BOOK/cross-tools/common/gcc-static.xml (revision 5bef7dfe172c3291f071505cd77000abb672d6ef)
+++ BOOK/cross-tools/common/gcc-static.xml (revision d3a81ee2a903fb1e5c98f4f32eb31e1ab1f6d7b6)
@@ -51,6 +51,6 @@
/tools:
-echo -en '\n#undef STANDARD_STARTFILE_PREFIX_1\n#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"\n' >> gcc/config/linux.h
-echo -en '\n#undef STANDARD_STARTFILE_PREFIX_2\n#define STANDARD_STARTFILE_PREFIX_2 ""\n' >> gcc/config/linux.h
+echo -en '\n#undef STANDARD_STARTFILE_PREFIX_1\n#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"\n' >> gcc/config/linux.h
+echo -en '\n#undef STANDARD_STARTFILE_PREFIX_2\n#define STANDARD_STARTFILE_PREFIX_2 ""\n' >> gcc/config/linux.h
We will create a dummy limits.h so
Index: BOOK/cross-tools/ppc/gcc-static.xml
===================================================================
--- BOOK/cross-tools/ppc/gcc-static.xml (revision 5bef7dfe172c3291f071505cd77000abb672d6ef)
+++ BOOK/cross-tools/ppc/gcc-static.xml (revision d3a81ee2a903fb1e5c98f4f32eb31e1ab1f6d7b6)
@@ -48,6 +48,6 @@
xpointer="xpointer(//*[@os='ag'])"/>
-echo -en '\n#undef STANDARD_STARTFILE_PREFIX_1\n#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"\n' >> gcc/config/rs6000/sysv4.h
-echo -en '\n#undef STANDARD_STARTFILE_PREFIX_2\n#define STANDARD_STARTFILE_PREFIX_2 ""\n' >> gcc/config/rs6000/sysv4.h
+echo -en '\n#undef STANDARD_STARTFILE_PREFIX_1\n#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"\n' >> gcc/config/rs6000/sysv4.h
+echo -en '\n#undef STANDARD_STARTFILE_PREFIX_2\n#define STANDARD_STARTFILE_PREFIX_2 ""\n' >> gcc/config/rs6000/sysv4.h
-echo "dummy:x:1000:nobody" >> /etc/group
+echo "dummy:x:1000:nobody" >> /etc/group
Fix permissions of some files so the non-root user can compile
Index: BOOK/final-system/common/ncurses.xml
===================================================================
--- BOOK/final-system/common/ncurses.xml (revision 5bef7dfe172c3291f071505cd77000abb672d6ef)
+++ BOOK/final-system/common/ncurses.xml (revision d3a81ee2a903fb1e5c98f4f32eb31e1ab1f6d7b6)
@@ -68,5 +68,5 @@
for lib in curses ncurses form panel menu ; do
- echo "INPUT(-l${lib}w)" > /usr/lib/lib${lib}.so
+ echo "INPUT(-l${lib}w)" > /usr/lib/lib${lib}.so
ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a
done
Index: BOOK/final-system/common/tar.xml
===================================================================
--- BOOK/final-system/common/tar.xml (revision 5bef7dfe172c3291f071505cd77000abb672d6ef)
+++ BOOK/final-system/common/tar.xml (revision d3a81ee2a903fb1e5c98f4f32eb31e1ab1f6d7b6)
@@ -49,5 +49,5 @@
Generate the man page and place it in the proper location:
-perl tarman > /usr/share/man/man1/tar.1
+perl tarman > /usr/share/man/man1/tar.1
Install the documentation:
Index: BOOK/final-system/multilib/ncurses-64bit.xml
===================================================================
--- BOOK/final-system/multilib/ncurses-64bit.xml (revision 5bef7dfe172c3291f071505cd77000abb672d6ef)
+++ BOOK/final-system/multilib/ncurses-64bit.xml (revision d3a81ee2a903fb1e5c98f4f32eb31e1ab1f6d7b6)
@@ -86,5 +86,5 @@
for lib in curses ncurses form panel menu ; do
- echo "INPUT(-l${lib}w)" > /usr/lib64/lib${lib}.so
+ echo "INPUT(-l${lib}w)" > /usr/lib64/lib${lib}.so
ln -sfv lib${lib}w.a /usr/lib64/lib${lib}.a
done
Index: BOOK/final-system/multilib/ncurses-n32.xml
===================================================================
--- BOOK/final-system/multilib/ncurses-n32.xml (revision 5bef7dfe172c3291f071505cd77000abb672d6ef)
+++ BOOK/final-system/multilib/ncurses-n32.xml (revision d3a81ee2a903fb1e5c98f4f32eb31e1ab1f6d7b6)
@@ -86,5 +86,5 @@
for lib in curses ncurses form panel menu ; do
- echo "INPUT(-l${lib}w)" > /usr/lib32/lib${lib}.so
+ echo "INPUT(-l${lib}w)" > /usr/lib32/lib${lib}.so
ln -sfv lib${lib}w.a /usr/lib32/lib${lib}.a
done
Index: BOOK/final-system/multilib/ncurses.xml
===================================================================
--- BOOK/final-system/multilib/ncurses.xml (revision 5bef7dfe172c3291f071505cd77000abb672d6ef)
+++ BOOK/final-system/multilib/ncurses.xml (revision d3a81ee2a903fb1e5c98f4f32eb31e1ab1f6d7b6)
@@ -87,5 +87,5 @@
for lib in curses ncurses form panel menu ; do
- echo "INPUT(-l${lib}w)" > /usr/lib/lib${lib}.so
+ echo "INPUT(-l${lib}w)" > /usr/lib/lib${lib}.so
ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a
done
Index: BOOK/final-system/multilib/perl-64bit.xml
===================================================================
--- BOOK/final-system/multilib/perl-64bit.xml (revision 5bef7dfe172c3291f071505cd77000abb672d6ef)
+++ BOOK/final-system/multilib/perl-64bit.xml (revision d3a81ee2a903fb1e5c98f4f32eb31e1ab1f6d7b6)
@@ -47,5 +47,5 @@
We still need to tell Perl to actually use lib64:
-echo 'installstyle="lib64/perl5"' >>hints/linux.sh
+echo 'installstyle="lib64/perl5"' >> hints/linux.sh
We still need to tell perl to actually use lib32:
-echo 'installstyle="lib32/perl5"' >>hints/linux.sh
+echo 'installstyle="lib32/perl5"' >> hints/linux.sh
dummy.log 2>&1
+echo 'main(){}' | gcc -v -o /dev/null -x c - > dummy.log 2>&1
if ! grep -q ' error' dummy.log; then
echo "Compilation successful" && rm dummy.log
Index: BOOK/temp-system/common/bison.xml
===================================================================
--- BOOK/temp-system/common/bison.xml (revision 5bef7dfe172c3291f071505cd77000abb672d6ef)
+++ BOOK/temp-system/common/bison.xml (revision d3a81ee2a903fb1e5c98f4f32eb31e1ab1f6d7b6)
@@ -26,5 +26,5 @@
cp -v Makefile.in{,.orig}
-sed '/bison.help:/s/^/# /' Makefile.in.orig > Makefile.in
+sed '/bison.help:/s/^/# /' Makefile.in.orig > Makefile.in
cp -v Makefile{,.orig}
sed "/^HOST_\(GMP\|ISL\|CLOOG\)\(LIBS\|INC\)/s:/tools:/cross-tools:g" \
- Makefile.orig > Makefile
+ Makefile.orig > Makefile
Compile the package:
Index: BOOK/the-end/downloadclient.xml
===================================================================
--- BOOK/the-end/downloadclient.xml (revision 5bef7dfe172c3291f071505cd77000abb672d6ef)
+++ BOOK/the-end/downloadclient.xml (revision d3a81ee2a903fb1e5c98f4f32eb31e1ab1f6d7b6)
@@ -58,8 +58,8 @@
NetService = "/inet/tcp/0/mirror.anl.gov/80"
print "GET /pub/gnu/wget/wget-1.14.tar.xz" |& NetService
- while ((NetService |& getline) > 0)
+ while ((NetService |& getline) > 0)
print $0
close(NetService)
-}' > binary
+}' > binary
gawk '{q=p;p=$0}NR>1{print q}END{ORS = ""; print p}' binary > wget-1.14.tar.xz