Author: alexander
Date: 2005-12-05 05:50:07 -0700 (Mon, 05 Dec 2005)
New Revision: 1220
Modified:
branches/dm/doc/README
branches/dm/packages/bin86/Makefile
branches/dm/packages/bzip2/Makefile
branches/dm/packages/gettext/Makefile
branches/dm/packages/lilo/Makefile
branches/dm/packages/ncurses/Makefile
branches/dm/packages/perl/Makefile
branches/dm/packages/vim/Makefile
Log:
Reduced unneeded differences from trunk
Fixed the description of the method for deleting files in doc/README
Modified: branches/dm/doc/README
===================================================================
--- branches/dm/doc/README 2005-12-05 12:27:22 UTC (rev 1219)
+++ branches/dm/doc/README 2005-12-05 12:50:07 UTC (rev 1220)
@@ -96,17 +96,18 @@
instructions below.
* Burn the official CD in multi session mode:
- cdrecord dev=/dev/cdrom -v -multi -tao lfslivecd-x86-1-[version].iso
+ cdrecord dev=/dev/cdrom -v -multi -tao lfslivecd-[version].iso
* Prepare a directory with the files you want to add, delete or change:
mkdir second-session && cd second-session
vim path/to/new-file
vim path/to/file-to-be-changed
- touch path/to/.wh.file-to-be-deleted
+ echo path/to/file1-to-be-deleted >.delete
+ echo path/to/file2-to-be-deleted >>.delete
cd ..
* Make an image contatining those files:
- mkisofs -M lfslivecd-x86-6.1-1-[version].iso \
+ mkisofs -M lfslivecd-[version].iso \
-C `cdrecord -msinfo dev=/dev/cdrom` \
-R -o second-session.iso second-session
Modified: branches/dm/packages/bin86/Makefile
===================================================================
--- branches/dm/packages/bin86/Makefile 2005-12-05 12:27:22 UTC (rev 1219)
+++ branches/dm/packages/bin86/Makefile 2005-12-05 12:50:07 UTC (rev 1220)
@@ -17,7 +17,9 @@
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
stage2: Makefile $(FILE)
+ifneq ($(LFS-ARCH),ppc)
$(std_build)
+endif
compile-stage2:
make PREFIX=/usr
Modified: branches/dm/packages/bzip2/Makefile
===================================================================
--- branches/dm/packages/bzip2/Makefile 2005-12-05 12:27:22 UTC (rev 1219)
+++ branches/dm/packages/bzip2/Makefile 2005-12-05 12:50:07 UTC (rev 1220)
@@ -68,7 +68,8 @@
ln -s ../../lib64/libbz2.so.1.0 /usr/lib64/libbz2.so
endif
rm /usr/bin/{bunzip2,bzcat,bzip2}
- ln -s bzip2 /bin/bunzip2 && ln -s bzip2 /bin/bzcat
+ ln -s bzip2 /bin/bunzip2
+ ln -s bzip2 /bin/bzcat
clean:
-rm -rf $(DIR)
Modified: branches/dm/packages/gettext/Makefile
===================================================================
--- branches/dm/packages/gettext/Makefile 2005-12-05 12:27:22 UTC (rev
1219)
+++ branches/dm/packages/gettext/Makefile 2005-12-05 12:50:07 UTC (rev
1220)
@@ -18,16 +18,19 @@
compile-stage1:
ifndef CROSS
- ./configure --prefix=$(WD) --disable-libasprintf --without-csharp
+ cd $(NM)-tools ; ./configure --prefix=$(WD) --disable-shared
+ cd $(NM)-tools ; make -C lib
+ cd $(NM)-tools ; make -C src msgfmt
+ cd $(NM)-tools ; cp -v src/msgfmt $(WD)/bin
else
echo "am_cv_func_working_getline=yes" >> config.cache
CC="$${CC} $(64FLAGS)" CXX="$${CXX} $(64FLAGS)" \
./configure --prefix=$(WD) --libdir=$(WD)/lib64 \
--host=$(LFS_TARGET) --disable-libasprintf \
--without-csharp --cache-file=config.cache
-endif
make
make install
+endif
chroot:
chroot "$(MP)" $(chenv-pre-bash) \
Modified: branches/dm/packages/lilo/Makefile
===================================================================
--- branches/dm/packages/lilo/Makefile 2005-12-05 12:27:22 UTC (rev 1219)
+++ branches/dm/packages/lilo/Makefile 2005-12-05 12:50:07 UTC (rev 1220)
@@ -20,7 +20,9 @@
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
stage2: Makefile $(FILE) $(PATCH1)
+ifneq ($(LFS-ARCH),ppc)
$(std_build)
+endif
compile-stage2:
patch -Np1 -i ../$(PATCH1)
Modified: branches/dm/packages/ncurses/Makefile
===================================================================
--- branches/dm/packages/ncurses/Makefile 2005-12-05 12:27:22 UTC (rev
1219)
+++ branches/dm/packages/ncurses/Makefile 2005-12-05 12:50:07 UTC (rev
1220)
@@ -49,7 +49,8 @@
make install
ifndef CROSS
chmod 755 /usr/lib/*.$(VRS)
- chmod 644 /usr/lib/libncurses++.a && mv /usr/lib/libncurses.so.5* /lib
+ chmod 644 /usr/lib/libncurses++.a
+ mv /usr/lib/libncurses.so.5* /lib
ln -sf ../../lib/libncurses.so.5 /usr/lib/libncurses.so
ln -sf libncurses.so /usr/lib/libcurses.so
else
Modified: branches/dm/packages/perl/Makefile
===================================================================
--- branches/dm/packages/perl/Makefile 2005-12-05 12:27:22 UTC (rev 1219)
+++ branches/dm/packages/perl/Makefile 2005-12-05 12:50:07 UTC (rev 1220)
@@ -30,7 +30,7 @@
chmod u+w hints/linux.sh
echo "installstyle=\"lib64/perl5\"" >> hints/linux.sh
endif
- ./configure.gnu --prefix=$(WD) -Dstatic_ext='IO Fcntl POSIX'
+ ./configure.gnu --prefix=$(WD) -Dstatic_ext='Data/Dumper Fcntl IO POSIX'
make perl utilities
cp perl pod/pod2man $(WD)/bin
ifndef CROSS
@@ -50,7 +50,7 @@
compile-stage2:
ifndef CROSS
- ./configure.gnu --prefix=/usr -Dpager="/bin/less -isR"
+ ./configure.gnu --prefix=/usr -Dpager="/usr/bin/less -isR"
else
sed -i '[EMAIL PROTECTED]/[EMAIL PROTECTED]/[EMAIL PROTECTED]'
hints/linux.sh
patch -Np1 -i ../$(PATCH40)
Modified: branches/dm/packages/vim/Makefile
===================================================================
--- branches/dm/packages/vim/Makefile 2005-12-05 12:27:22 UTC (rev 1219)
+++ branches/dm/packages/vim/Makefile 2005-12-05 12:50:07 UTC (rev 1220)
@@ -42,7 +42,7 @@
ln -sf vim /usr/bin/vi
cp $(ROOT)/etc/vimrc /etc
-stage3: Makefile $(FILE) $(FILE2) $(PATCH1)
+stage3: Makefile $(FILE) $(FILE2)
$(std_build)
compile-stage3:
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
