Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (fe2892f2a6a6e5588c4b51cf8756ea92ad85fbf1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (fe2892f2a6a6e5588c4b51cf8756ea92ad85fbf1)
  • Date: Sat, 9 Aug 2008 10:47:07 -0500

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

disk/grub/DETAILS | 2
disk/grub/HISTORY | 4 +
disk/grub/PRE_BUILD | 2
disk/grub/grub-0.97-ext2_256byte_inode.patch | 102
+++++++++++++++++++++++++++
4 files changed, 109 insertions(+), 1 deletion(-)

New commits:
commit 4e30b8fc6e7e8a6cea2654987b54bc8066891aef
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

grub: add patch for bigger ext3 indoes (as current mke2fs does by default)

diff --git a/disk/grub/DETAILS b/disk/grub/DETAILS
index eb1b895..54edc04 100755
--- a/disk/grub/DETAILS
+++ b/disk/grub/DETAILS
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_HASH=sha512:c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb
WEB_SITE=http://www.gnu.org/software/grub/
ENTERED=20020403
- PATCHLEVEL=1
+ PATCHLEVEL=2
LICENSE[0]=GPL
VOYEUR="on"
SHORT="GNU GRUB bootloader"
diff --git a/disk/grub/HISTORY b/disk/grub/HISTORY
index dc7a870..dc6ab67 100644
--- a/disk/grub/HISTORY
+++ b/disk/grub/HISTORY
@@ -1,3 +1,7 @@
+2008-08-09 Thomas Orgis <sobukus AT sourcemage.org>
+ * grub-0.97-ext2_256byte_inode.patch, PRE_BUILD, DETAILS:
+ Add patch to make grub work again with newer ext3 fs (bigger
inodes).
+
2007-03-15 George Sherwood <george AT beernabeer.com>
* CONFIGURE: Add query to use graphical boot screen. Bug #12852
* PRE_BUILD: Added if statement to check if user wants to
diff --git a/disk/grub/PRE_BUILD b/disk/grub/PRE_BUILD
index 781eb69..3d5dd6a 100755
--- a/disk/grub/PRE_BUILD
+++ b/disk/grub/PRE_BUILD
@@ -5,6 +5,8 @@ patch -p1 <
${SCRIPT_DIRECTORY}/grub-0.96-bounced-checks.patch &&
patch -p1 < ${SCRIPT_DIRECTORY}/grub-0.96-i2o-raid.patch &&
patch -p1 < ${SCRIPT_DIRECTORY}/grub-0.97-PIC.patch &&
patch -p1 < ${SCRIPT_DIRECTORY}/grub-0.97-nxstack.patch &&
+message "${MESSAGE_COLOR}Applying ext3 256B inode patch.$DEFAULT_COLOR" &&
+patch -p1 < ${SCRIPT_DIRECTORY}/grub-0.97-ext2_256byte_inode.patch &&
patch -p0 < ${SCRIPT_DIRECTORY}/configure.ac.patch &&

if [ "$GRUB_GRAPHICS" == "y" ]; then
diff --git a/disk/grub/grub-0.97-ext2_256byte_inode.patch
b/disk/grub/grub-0.97-ext2_256byte_inode.patch
new file mode 100644
index 0000000..0fb98f1
--- /dev/null
+++ b/disk/grub/grub-0.97-ext2_256byte_inode.patch
@@ -0,0 +1,102 @@
+
+Patch from Red Hat. See #463236, #463123 (and #491076 for the reviewed
version)
+
+diff -ur grub-0.97/stage2/fsys_ext2fs.c grub-0.97.new/stage2/fsys_ext2fs.c
+--- grub-0.97/stage2/fsys_ext2fs.c 2008-07-23 01:18:18.000000000 +0200
++++ grub-0.97.new/stage2/fsys_ext2fs.c 2008-07-25 14:33:29.000000000 +0200
+@@ -79,7 +79,52 @@
+ __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,14 @@
+ #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_GOOD_OLD_REV 0 /* The good old (original) format */
++#define EXT2_DYNAMIC_REV 1 /* V2 format w/ dynamic inode sizes */
++#define EXT2_GOOD_OLD_INODE_SIZE 128
++#define EXT2_INODE_SIZE(s) (((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \
++ EXT2_GOOD_OLD_INODE_SIZE : \
++ (s)->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 +606,7 @@
+ 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 +618,12 @@
+ /* 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;



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (fe2892f2a6a6e5588c4b51cf8756ea92ad85fbf1), Thomas Orgis, 08/09/2008

Archive powered by MHonArc 2.6.24.

Top of Page