mirror of
https://git.yoctoproject.org/poky
synced 2026-02-05 16:28:43 +01:00
b1c27d69f6
* add git headers so that all can be applied with git am (From OE-Core rev: 22fdcdd217b8d5bd4c8e418566302cdafa219e9a) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
82 lines
2.3 KiB
Diff
82 lines
2.3 KiB
Diff
From 906205015601d5d1190e7326f51ea4316a74a479 Mon Sep 17 00:00:00 2001
|
|
From: Robert Yang <liezhi.yang@windriver.com>
|
|
Date: Fri, 2 Jan 2015 12:18:02 +0800
|
|
Subject: [PATCH] linux/syslinux: implement ext_construct_sectmap_fs()
|
|
|
|
The ext_construct_sectmap_fs() constucts the sector according to the
|
|
bmap.
|
|
|
|
Upstream-Status: Submitted
|
|
|
|
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
|
Tested-by: Du Dolpher <dolpher.du@intel.com>
|
|
---
|
|
linux/syslinux.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 50 insertions(+)
|
|
|
|
diff --git a/linux/syslinux.c b/linux/syslinux.c
|
|
index 7a20fe6..4e43921 100755
|
|
--- a/linux/syslinux.c
|
|
+++ b/linux/syslinux.c
|
|
@@ -422,10 +422,60 @@ int install_bootblock(int fd, const char *device)
|
|
{
|
|
}
|
|
|
|
+/* The file's block count */
|
|
+int block_count = 0;
|
|
+static int get_block_count(ext2_filsys fs EXT2FS_ATTR((unused)),
|
|
+ blk64_t *blocknr EXT2FS_ATTR((unused)),
|
|
+ e2_blkcnt_t blockcnt EXT2FS_ATTR((unused)),
|
|
+ blk64_t ref_block EXT2FS_ATTR((unused)),
|
|
+ int ref_offset EXT2FS_ATTR((unused)),
|
|
+ void *private EXT2FS_ATTR((unused)))
|
|
+{
|
|
+ block_count++;
|
|
+ return 0;
|
|
+}
|
|
+
|
|
/* Construct the boot file map */
|
|
int ext_construct_sectmap_fs(ext2_filsys fs, ext2_ino_t newino,
|
|
sector_t *sectors, int nsect)
|
|
{
|
|
+ blk64_t pblk, blksize, blk = 0;
|
|
+ sector_t sec;
|
|
+ unsigned int i;
|
|
+ int retval;
|
|
+
|
|
+ blksize = fs->blocksize;
|
|
+ blksize >>= SECTOR_SHIFT;
|
|
+
|
|
+ /* Get the total blocks no. */
|
|
+ retval = ext2fs_block_iterate3(fs, newino, BLOCK_FLAG_READ_ONLY,
|
|
+ NULL, get_block_count, NULL);
|
|
+ if (retval) {
|
|
+ fprintf(stderr, "%s: ERROR: ext2fs_block_iterate3() failed.\n", program);
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
+ while (nsect) {
|
|
+ if (block_count-- == 0)
|
|
+ break;
|
|
+
|
|
+ /* Get the physical block no. (bmap) */
|
|
+ retval = ext2fs_bmap2(fs, newino, 0, 0, 0, blk, 0, &pblk);
|
|
+ if (retval) {
|
|
+ fprintf(stderr, "%s: ERROR: ext2fs_bmap2() failed.\n", program);
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
+ blk++;
|
|
+ sec = (sector_t)pblk * blksize;
|
|
+ for (i = 0; i < blksize; i++) {
|
|
+ *sectors++ = sec++;
|
|
+ if (! --nsect)
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
}
|
|
|
|
static int handle_adv_on_ext(void)
|