Author: alexander
Date: 2006-09-09 03:55:42 -0600 (Sat, 09 Sep 2006)
New Revision: 1726
Modified:
branches/6.2/Makefile
branches/6.2/packages/grub/Makefile
branches/6.2/packages/reiser4progs/Makefile
Log:
Added reiser4 support to grub
Modified: branches/6.2/Makefile
===================================================================
--- branches/6.2/Makefile 2006-09-08 16:17:55 UTC (rev 1725)
+++ branches/6.2/Makefile 2006-09-09 09:55:42 UTC (rev 1726)
@@ -229,7 +229,7 @@
ch-perl ch-readline ch-zlib ch-autoconf ch-automake ch-bash
post-bash: ch-bzip2 ch-diffutils ch-e2fsprogs ch-file ch-findutils ch-flex \
- ch-grub ch-gawk ch-gettext ch-grep ch-groff ch-gzip ch-inetutils \
+ ch-gawk ch-gettext ch-grep ch-groff ch-gzip ch-inetutils \
ch-iproute2 ch-kbd ch-less ch-make ch-man-db ch-mktemp \
ch-module-init-tools ch-patch ch-psmisc ch-shadow ch-sysklogd \
ch-sysvinit ch-tar ch-texinfo ch-udev ch-util-linux ch-vim \
@@ -260,13 +260,11 @@
ch-libchewing ch-scim-chewing ch-scim-pinyin ch-scim-input-pad \
ch-hibernate-script ch-parted
ifeq ($(LFS-ARCH),x86)
- make ch-vbetool ch-bin86 ch-lilo ch-syslinux ch-gcc33
ch-proprietary-drivers
- make ch-binutils64 ch-gcc64 ch-linux64
+ make ch-vbetool ch-bin86 ch-grub ch-lilo ch-syslinux ch-gcc33
+ make ch-proprietary-drivers ch-binutils64 ch-gcc64 ch-linux64
endif
ifeq ($(LFS-ARCH),ppc)
- make ch-yaboot
- make ch-hfsutils
- make ch-mac-fdisk
+ make ch-yaboot ch-hfsutils ch-mac-fdisk
endif
make update-caches
Modified: branches/6.2/packages/grub/Makefile
===================================================================
--- branches/6.2/packages/grub/Makefile 2006-09-08 16:17:55 UTC (rev 1725)
+++ branches/6.2/packages/grub/Makefile 2006-09-09 09:55:42 UTC (rev 1726)
@@ -12,6 +12,10 @@
URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/6.2/$(PATCH1)
SHA-$(PATCH1)= 651801fe6d851c9f59ccd16b6bd49f1358c9594c
+PATCH2=$(DIR)-reiser4-20050808.diff
+URL-$(PATCH2)= ftp://ftp.namesys.com/pub/reiser4progs/$(PATCH2)
+SHA-$(PATCH2)= ffe2628e07a4c0dcf98360b03d9828936ca21d28
+
# Targets
include $(ROOT)/scripts/functions
@@ -20,17 +24,19 @@
chroot "$(MP)" $(chenv-post-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE) $(PATCH1) $(PATCH2)
$(std_build)
cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
compile-stage2:
-ifeq ($(LFS-ARCH),x86)
- patch -Np1 -i ../$(PATCH1)
+ patch -Np1 -i ../$(PATCH2)
+ # This will fail to add -fno-strict-aliasing to CFLAGS,
+ # but this flag is already present on the CD. So ignore the reject.
+ patch -Np1 -i ../$(PATCH1) || true
+ autoreconf --force --install --verbose
./configure --prefix=/usr
make $(PM)
make install
-endif
clean:
-rm -rf $(DIR)
Modified: branches/6.2/packages/reiser4progs/Makefile
===================================================================
--- branches/6.2/packages/reiser4progs/Makefile 2006-09-08 16:17:55 UTC (rev
1725)
+++ branches/6.2/packages/reiser4progs/Makefile 2006-09-09 09:55:42 UTC (rev
1726)
@@ -20,7 +20,8 @@
$(std_build)
compile-stage2:
- ./configure --prefix=/usr --sbindir=/sbin
+ # GRUB doesn't like shared libreiser4_minimal
+ ./configure --prefix=/usr --sbindir=/sbin --enable-static
make $(PM)
make install
ln -sf mkfs.reiser4 /sbin/mkreiser4fs
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
