diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 23:00:18 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 23:00:18 +0100 |
| commit | 5bfdfbcee97c930c3c14dc3745089ac28e76ca41 (patch) | |
| tree | 723a2310434afd85f68b3437e17917fcc6c5d623 /package/cfgfs | |
| parent | 16d7827ef1aec4aab89033ed1d47ca82fa3a3ba7 (diff) | |
| parent | 58d31896056e604185acf3606b99257cea519dd1 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/cfgfs')
| -rw-r--r-- | package/cfgfs/Makefile | 6 | ||||
| -rw-r--r-- | package/cfgfs/src/fwcf.sh | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index a3af3dd62..1b6d6366c 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -5,20 +5,18 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cfgfs PKG_VERSION:= 1.0.8 -PKG_RELEASE:= 2 +PKG_RELEASE:= 4 PKG_DESCR:= compressed config filesystem PKG_SECTION:= base PKG_URL:= http://openadk.org/ -PKG_TARGET_DEPENDS:= alix wrap foxboard ag241 foxg20 routerboard x86 x86_64 - PKG_CFLINE_CFGFS:= select BUSYBOX_COMM@ PKG_CFLINE_CFGFS+= select BUSYBOX_MD5SUM@ PKG_CFLINE_CFGFS+= select BUSYBOX_XARGS@ PKG_CFLINE_CFGFS+= select BUSYBOX_FEATURE_SORT_BIG@ PKG_CFLINE_CFGFS+= select BUSYBOX_DIFF@ PKG_CFLINE_CFGFS+= depends on !ADK_TARGET_ROOTFS_NFSROOT && !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS -PKG_DFLT_CFGFS:= y +PKG_DFLT_CFGFS:= y if !ADK_TOOLCHAIN_ONLY WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 diff --git a/package/cfgfs/src/fwcf.sh b/package/cfgfs/src/fwcf.sh index 6f99393dd..ddcbfcc50 100644 --- a/package/cfgfs/src/fwcf.sh +++ b/package/cfgfs/src/fwcf.sh @@ -125,7 +125,10 @@ fi # find backend device, first try to find partition with ID 88 rootdisk=$(readlink /dev/root) -part=$(fdisk -l /dev/${rootdisk%1}|awk '$5 == 88 { print $1 }') +# strip partitions (f.e. mmcblk0p2, sda2, ..) +rootdisk=${rootdisk%p*} +rootdisk=${rootdisk%[1-9]} +part=$(fdisk -l /dev/$rootdisk 2>/dev/null|awk '$5 == 88 { print $1 }') if [ -z $part ]; then # otherwise search for MTD device with name cfgfs part=/dev/mtd$(fgrep '"cfgfs"' /proc/mtd 2>/dev/null | sed 's/^mtd\([^:]*\):.*$/\1/')ro |