Changeset 1726

Timestamp:

09/09/06 03:55:42 (2 years ago)

Author:

alexander

Message:

Added reiser4 support to grub

Location:

branches/6.2

Files:

• Makefile (modified) (2 diffs)
• packages/grub/Makefile (modified) (2 diffs)
• packages/reiser4progs/Makefile (modified) (1 diff)

branches/6.2/Makefile

@@ -230 +230 @@
 
 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 \
@@ -261 +261 @@
         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

branches/6.2/packages/grub/Makefile

@@ -13 +13 @@
 SHA-$(PATCH1)= 651801fe6d851c9f59ccd16b6bd49f1358c9594c
 
+PATCH2=$(DIR)-reiser4-20050808.diff
+URL-$(PATCH2)= ftp://ftp.namesys.com/pub/reiser4progs/$(PATCH2)
+SHA-$(PATCH2)= ffe2628e07a4c0dcf98360b03d9828936ca21d28
+
 # Targets
 
@@ -21 +25 @@
         '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:

branches/6.2/packages/reiser4progs/Makefile

@@ -21 +21 @@
 
 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