Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9e9a5f0a3968f09a6252e3c91313a3cdc79fae1f
commit 9e9a5f0a3968f09a6252e3c91313a3cdc79fae1f
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Thu Feb 14 11:29:08 2008 +0100
grub-0.97-20-i686
- add 06-grub-support-256byte-inode.patch
- this is necessary as now mke2fs creates 256-byte-sized inodes by default, so
grub simply won't be able to boot a Frugalware-0.8rc2 system without this
patch
diff --git a/source/base/grub/06-grub-support-256byte-inode.patch
b/source/base/grub/06-grub-support-256byte-inode.patch
new file mode 100644
index 0000000..ad7ffaf
--- /dev/null
+++ b/source/base/grub/06-grub-support-256byte-inode.patch
@@ -0,0 +1,97 @@
+
+Patch from Red Hat.
+
+diff -Nrup a/stage2/fsys_ext2fs.c b/stage2/fsys_ext2fs.c
+--- a/stage2/fsys_ext2fs.c 2004-08-08 20:19:18.000000000 +0200
++++ b/stage2/fsys_ext2fs.c 2008-01-30 14:27:20.000000000 +0100
+@@ -79,7 +79,52 @@ struct ext2_super_block
+ __u32 s_rev_level; /* Revision level */
+ __u16 s_def_resuid; /* Default uid for reserved blocks */
+ __u16 s_def_resgid; /* Default gid for reserved blocks */
+- __u32 s_reserved[235]; /* Padding to the end of the block */
++ /*
++ * These fields are for EXT2_DYNAMIC_REV superblocks only.
++ *
++ * Note: the difference between the compatible feature set and
++ * the incompatible feature set is that if there is a bit set
++ * in the incompatible feature set that the kernel doesn't
++ * know about, it should refuse to mount the filesystem.
++ *
++ * e2fsck's requirements are more strict; if it doesn't know
++ * about a feature in either the compatible or incompatible
++ * feature set, it must abort and not try to meddle with
++ * things it doesn't understand...
++ */
++ __u32 s_first_ino; /* First non-reserved inode */
++ __u16 s_inode_size; /* size of inode structure */
++ __u16 s_block_group_nr; /* block group # of this superblock */
++ __u32 s_feature_compat; /* compatible feature set */
++ __u32 s_feature_incompat; /* incompatible feature set */
++ __u32 s_feature_ro_compat; /* readonly-compatible feature set */
++ __u8 s_uuid[16]; /* 128-bit uuid for volume */
++ char s_volume_name[16]; /* volume name */
++ char s_last_mounted[64]; /* directory where last mounted */
++ __u32 s_algorithm_usage_bitmap; /* For compression */
++ /*
++ * Performance hints. Directory preallocation should only
++ * happen if the EXT2_FEATURE_COMPAT_DIR_PREALLOC flag is on.
++ */
++ __u8 s_prealloc_blocks; /* Nr of blocks to try to preallocate*/
++ __u8 s_prealloc_dir_blocks; /* Nr to preallocate for dirs */
++ __u16 s_reserved_gdt_blocks;/* Per group table for online growth */
++ /*
++ * Journaling support valid if EXT2_FEATURE_COMPAT_HAS_JOURNAL set.
++ */
++ __u8 s_journal_uuid[16]; /* uuid of journal superblock */
++ __u32 s_journal_inum; /* inode number of journal file */
++ __u32 s_journal_dev; /* device number of journal file */
++ __u32 s_last_orphan; /* start of list of inodes to delete */
++ __u32 s_hash_seed[4]; /* HTREE hash seed */
++ __u8 s_def_hash_version; /* Default hash version to use */
++ __u8 s_jnl_backup_type; /* Default type of journal backup */
++ __u16 s_reserved_word_pad;
++ __u32 s_default_mount_opts;
++ __u32 s_first_meta_bg; /* First metablock group */
++ __u32 s_mkfs_time; /* When the filesystem was created */
++ __u32 s_jnl_blocks[17]; /* Backup of the journal inode */
++ __u32 s_reserved[172]; /* Padding to the end of the block */
+ };
+
+ struct ext2_group_desc
+@@ -218,6 +263,9 @@ struct ext2_dir_entry
+ #define EXT2_ADDR_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (__u32))
+ #define EXT2_ADDR_PER_BLOCK_BITS(s) (log2(EXT2_ADDR_PER_BLOCK(s)))
+
++#define EXT2_INODE_SIZE(s) (SUPERBLOCK->s_inode_size)
++#define EXT2_INODES_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s)/EXT2_INODE_SIZE(s))
++
+ /* linux/ext2_fs.h */
+ #define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_log_block_size + 10)
+ /* kind of from ext2/super.c */
+@@ -553,7 +601,7 @@ ext2fs_dir (char *dirname)
+ gdp = GROUP_DESC;
+ ino_blk = gdp[desc].bg_inode_table +
+ (((current_ino - 1) % (SUPERBLOCK->s_inodes_per_group))
+- >> log2 (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode)));
++ >> log2 (EXT2_INODES_PER_BLOCK (SUPERBLOCK)));
+ #ifdef E2DEBUG
+ printf ("inode table fsblock=%d\n", ino_blk);
+ #endif /* E2DEBUG */
+@@ -565,13 +613,12 @@ ext2fs_dir (char *dirname)
+ /* reset indirect blocks! */
+ mapblock2 = mapblock1 = -1;
+
+- raw_inode = INODE +
+- ((current_ino - 1)
+- & (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode) - 1));
++ raw_inode = (struct ext2_inode *)((char *)INODE +
++ ((current_ino - 1) & (EXT2_INODES_PER_BLOCK (SUPERBLOCK) - 1)) *
++ EXT2_INODE_SIZE (SUPERBLOCK));
+ #ifdef E2DEBUG
+ printf ("ipb=%d, sizeof(inode)=%d\n",
+- (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode)),
+- sizeof (struct ext2_inode));
++ EXT2_INODES_PER_BLOCK (SUPERBLOCK), EXT2_INODE_SIZE (SUPERBLOCK));
+ printf ("inode=%x, raw_inode=%x\n", INODE, raw_inode);
+ printf ("offset into inode table block=%d\n", (int) raw_inode - (int)
INODE);
+ for (i = (unsigned char *) INODE; i <= (unsigned char *) raw_inode;
diff --git a/source/base/grub/FrugalBuild b/source/base/grub/FrugalBuild
index e4cdf67..b2b09a8 100644
--- a/source/base/grub/FrugalBuild
+++ b/source/base/grub/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=grub
pkgver=0.97
-pkgrel=19
+pkgrel=20
pkgdesc="The GNU GRand Unified Bootloader"
url="http://www.gnu.org/software/grub/";
depends=('texinfo')
@@ -19,7 +19,8 @@ source=(ftp://alpha.gnu.org/gnu/grub/grub-$pkgver.tar.gz \
02-$pkgname-$pkgver-debugcdboot.patch \
03-$pkgname-$pkgver-gcc4.patch \
04-grub-0.97-x86_64.patch \
- 05-grub-0.97-initrdaddr.diff)
+ 05-grub-0.97-initrdaddr.diff \
+ 06-grub-support-256byte-inode.patch)
# Original patch was for Debian at:
# http://neverborn.org/files/grub-gfxboot/source/grub-gfxboot/ and
@@ -56,11 +57,12 @@ build()
# Ffilerel /boot/grub/message
}
-sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb'\
- 'ffe895e10705633228caa903cd5ec8f0e9b4f416'\
- 'ea8fcfc066d2ada5ebccfa3f6c5fc5ffc0dd9225'\
- '220d1b55f6573b026f7f6cbc583b8aeaede20878'\
- '157b81dbad3576536b08642242accfa1aeb093a9'\
- 'adbb4685c98797ffb4dc83561ec75698991dddbd')
+sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb' \
+ 'ffe895e10705633228caa903cd5ec8f0e9b4f416' \
+ 'ea8fcfc066d2ada5ebccfa3f6c5fc5ffc0dd9225' \
+ '220d1b55f6573b026f7f6cbc583b8aeaede20878' \
+ '157b81dbad3576536b08642242accfa1aeb093a9' \
+ 'adbb4685c98797ffb4dc83561ec75698991dddbd' \
+ '389913c8b09e5882373e7cb233ecfefb7ad3a3cb')
# optimization OK
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
