From 4b293da59639a0159149005c1b00fc93fccee4c7 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Fri, 7 Mar 2014 01:59:35 -0500 Subject: e2fsprogs: populate-extfs.sh: remove it Remove it since we don't need it anymore, and there is one inside the e2fsprogs. [YOCTO #4083] (From OE-Core rev: f3a95ca6886b55e5819b068bdbd2cceb882d91a6) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- .../e2fsprogs/e2fsprogs/populate-extfs.sh | 96 ---------------------- .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb | 2 - 2 files changed, 98 deletions(-) delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/populate-extfs.sh (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/populate-extfs.sh b/meta/recipes-devtools/e2fsprogs/e2fsprogs/populate-extfs.sh deleted file mode 100644 index 7de720b115..0000000000 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/populate-extfs.sh +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/sh - -do_usage () { - cat << _EOF -Usage: populate-extfs.sh -Create an ext2/ext3/ext4 filesystem from a directory or file - - source: The source directory or file - device: The target device - -_EOF - exit 1 -} - -[ $# -ne 2 ] && do_usage - -SRCDIR=${1%%/} -DEVICE=$2 -DEBUGFS="debugfs" - -{ - CWD="/" - find $SRCDIR | while read FILE; do - TGT="${FILE##*/}" - DIR="${FILE#$SRCDIR}" - DIR="${DIR%$TGT}" - - # Skip the root dir - [ ! -z "$DIR" ] || continue - [ ! -z "$TGT" ] || continue - - if [ "$DIR" != "$CWD" ]; then - echo "cd $DIR" - CWD="$DIR" - fi - - # Only stat once since stat is a time consuming command - STAT=$(stat -c "TYPE=\"%F\";DEVNO=\"0x%t 0x%T\";MODE=\"%f\";U=\"%u\";G=\"%g\"" "$FILE") - eval $STAT - - case $TYPE in - "directory") - echo "mkdir $TGT" - ;; - "regular file" | "regular empty file") - echo "write \"$FILE\" \"$TGT\"" - ;; - "symbolic link") - LINK_TGT=$(readlink "$FILE") - echo "symlink \"$TGT\" \"$LINK_TGT\"" - ;; - "block special file") - echo "mknod \"$TGT\" b $DEVNO" - ;; - "character special file") - echo "mknod \"$TGT\" c $DEVNO" - ;; - "fifo") - echo "mknod \"$TGT\" p" - ;; - *) - echo "Unknown/unhandled file type '$TYPE' file: $FILE" 1>&2 - ;; - esac - - # Set the file mode - echo "sif \"$TGT\" mode 0x$MODE" - - # Set uid and gid - echo "sif \"$TGT\" uid $U" - echo "sif \"$TGT\" gid $G" - done - - # Handle the hard links. - # Save the hard links to a file, use the inode number as the filename, for example: - # If a and b's inode number is 6775928, save a and b to /tmp/tmp.VrCwHh5gdt/6775928. - INODE_DIR=`mktemp -d` || exit 1 - for i in `find $SRCDIR -type f -links +1 -printf 'INODE=%i###FN=%p\n'`; do - eval `echo $i | sed 's$###$ $'` - echo ${FN#$SRCDIR} >>$INODE_DIR/$INODE - done - # Use the debugfs' ln and "sif links_count" to handle them. - for i in `ls $INODE_DIR`; do - # The link source - SRC=`head -1 $INODE_DIR/$i` - # Remove the files and link them again except the first one - for TGT in `sed -n -e '1!p' $INODE_DIR/$i`; do - echo "rm $TGT" - echo "ln $SRC $TGT" - done - LN_CNT=`cat $INODE_DIR/$i | wc -l` - # Set the links count - echo "sif $SRC links_count $LN_CNT" - done - rm -fr $INODE_DIR -} | $DEBUGFS -w -f - $DEVICE diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb index b369038f6b..3864ec1d47 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb @@ -4,7 +4,6 @@ require e2fsprogs.inc SRC_URI += "file://acinclude.m4 \ file://remove.ldconfig.call.patch \ file://fix-icache.patch \ - file://populate-extfs.sh \ file://quiet-debugfs.patch \ file://0001-mke2fs-add-the-ability-to-copy-files-from-a-given-di.patch \ file://0002-misc-create_inode.c-copy-files-recursively.patch \ @@ -51,7 +50,6 @@ do_install () { mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir} mv ${D}${base_libdir}/pkgconfig ${D}${libdir} fi - install -m 0755 ${WORKDIR}/populate-extfs.sh ${D}${bindir} } RDEPENDS_e2fsprogs = "e2fsprogs-badblocks" -- cgit v1.2.3-54-g00ecf