From 3a72ecb96ca9fb28af957a0b0c0a47d24bf0977b Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 8 Mar 2008 17:23:07 +0000 Subject: linux-handhelds-2.6: Use rm -f for stale initramfs cleanup. --- packages/linux/linux-handhelds-2.6.inc | 2 +- packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc index 998711fe76..9a783aa6de 100644 --- a/packages/linux/linux-handhelds-2.6.inc +++ b/packages/linux/linux-handhelds-2.6.inc @@ -56,7 +56,7 @@ do_configure() { do_compile_prepend() { # Clean up any stale initramfs archive - rm usr/initramfs_data.cpio.gz + rm -f usr/initramfs_data.cpio.gz if [ -n "${KERNEL_INITRAMFS_PATH}" -a "${ANGSTROM_MODE}" = "glibc" ]; then if [ ! -f ${KERNEL_INITRAMFS_PATH} ]; then echo "${KERNEL_INITRAMFS_PATH} does not exist, you may need to bitbake it separately" diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb index d9ec0efb71..5c524c7ea6 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." LICENSE = "GPL" -PR = "r16" +PR = "r17" DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From a6e8ec389b9f30b17706b6fae67af487439dc80f Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 8 Mar 2008 17:51:08 +0000 Subject: initramfs-module-bootmenu: Use klibc-linked fstype util, tested to work as expected. --- packages/initrdscripts/initramfs-module-bootmenu_1.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb index 02d696aa2e..1ee8598c77 100644 --- a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb +++ b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb @@ -1,7 +1,7 @@ SRC_URI = "file://30-bootmenu.sh" -PR = "r12" +PR = "r13" DESCRIPTION = "An initramfs module with UI for selection of boot device." -RDEPENDS = "klibc-utils-fstype-static initramfs-uniboot initramfs-module-block initramfs-module-loop initramfs-module-nfs" +RDEPENDS = "klibc-utils-static-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop initramfs-module-nfs" # For VFAT mounting. RRECOMMENDS = "kernel-module-nls-cp437 kernel-module-nls-iso8859-1" -- cgit v1.2.3 From 66574789f5c2b0d94e422a68e420c17a9d7f9b0b Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 8 Mar 2008 17:53:09 +0000 Subject: klibc-utils-fstype-static 1.1.1: Remove hacky recipe now that there's klibc-utils-static. --- .../klibc/files/fstype-sane-and-vfat-jffs2.patch | 68 ---------------------- packages/klibc/klibc-utils-fstype-static_1.1.1.bb | 14 ----- 2 files changed, 82 deletions(-) delete mode 100644 packages/klibc/files/fstype-sane-and-vfat-jffs2.patch delete mode 100644 packages/klibc/klibc-utils-fstype-static_1.1.1.bb (limited to 'packages') diff --git a/packages/klibc/files/fstype-sane-and-vfat-jffs2.patch b/packages/klibc/files/fstype-sane-and-vfat-jffs2.patch deleted file mode 100644 index e89c5adb9a..0000000000 --- a/packages/klibc/files/fstype-sane-and-vfat-jffs2.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -r 3c9d84425ba7 utils/fstype.c ---- a/utils/fstype.c Thu Feb 14 02:09:30 2008 +0200 -+++ b/utils/fstype.c Thu Feb 14 02:13:46 2008 +0200 -@@ -13,11 +13,18 @@ - */ - - #include -+#include - #include - #include - #include - #include - #include -+#if __BYTE_ORDER == __BIG_ENDIAN -+#include -+#else -+#include -+#endif -+ - - #define cpu_to_be32(x) __cpu_to_be32(x) /* Needed by romfs_fs.h */ - -@@ -105,6 +112,27 @@ static int romfs_image(const unsigned ch - return 0; - } - -+static int jffs2_image(const unsigned char *buf, unsigned long *blocks) -+{ -+ // Very sloppy! ;-E -+ if (*buf == 0x85 && buf[1] == 0x19) -+ return 1; -+ -+ return 0; -+} -+ -+static int vfat_image(const unsigned char *buf, unsigned long *blocks) -+{ -+ const struct romfs_super_block *sb = -+ (const struct romfs_super_block *)buf; -+ if (!strncmp(buf + 54, "FAT12 ", 8) -+ || !strncmp(buf + 54, "FAT16 ", 8) -+ || !strncmp(buf + 82, "FAT32 ", 8)) -+ return 1; -+ -+ return 0; -+} -+ - static int minix_image(const unsigned char *buf, unsigned long *blocks) - { - const struct minix_super_block *sb = -@@ -167,8 +195,6 @@ static int xfs_image(const unsigned char - (const struct xfs_sb *)buf; - - if (__be32_to_cpu(sb->sb_magicnum) == XFS_SB_MAGIC) { -- *blocks = __be64_to_cpu(sb->sb_dblocks) * -- (__be32_to_cpu(sb->sb_blocksize) / BLOCK_SIZE); - return 1; - } - return 0; -@@ -184,6 +210,8 @@ static struct imagetype images[] = { - { 0, "gzip", gzip_image }, - { 0, "cramfs", cramfs_image }, - { 0, "romfs", romfs_image }, -+ { 0, "jffs2", jffs2_image }, -+ { 0, "vfat", vfat_image }, - { 0, "xfs", xfs_image }, - { 1, "minix", minix_image }, - { 1, "ext3", ext3_image }, diff --git a/packages/klibc/klibc-utils-fstype-static_1.1.1.bb b/packages/klibc/klibc-utils-fstype-static_1.1.1.bb deleted file mode 100644 index 2bcc0f6085..0000000000 --- a/packages/klibc/klibc-utils-fstype-static_1.1.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2" -SRC_URI += "file://fstype-sane-and-vfat-jffs2.patch;patch=1" -PR = "r1" - -S = "${WORKDIR}/klibc-${PV}" - -do_compile() { - ${CC} -o fstype utils/fstype.c -static -} - -do_install () { - install -d ${D}${bindir} - install -m 0755 fstype ${D}${bindir}/ -} -- cgit v1.2.3