From 80f6f4e3683f7889e4aa34401e96be1708f94b75 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Fri, 15 Dec 2017 09:18:37 +0800 Subject: hdparm: replace stat with coreutils as runtime dependency Currently only hdparm specifies stat as runtime dependency in oe-core. But the stat hasn't any update since 2002. Replace it with coreutils as runtime dependency since coreutils also provides stat program. Then we can drop the stat recipe totally. Also add a patch to fix stat path in wiper.sh. Signed-off-by: Yi Zhao Signed-off-by: Ross Burton --- .../hdparm/hdparm/wiper.sh-fix-stat-path.patch | 38 ++++++++++++++++++++++ meta/recipes-extended/hdparm/hdparm_9.52.bb | 6 ++-- 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-extended/hdparm/hdparm/wiper.sh-fix-stat-path.patch diff --git a/meta/recipes-extended/hdparm/hdparm/wiper.sh-fix-stat-path.patch b/meta/recipes-extended/hdparm/hdparm/wiper.sh-fix-stat-path.patch new file mode 100644 index 0000000000..4af1b617ed --- /dev/null +++ b/meta/recipes-extended/hdparm/hdparm/wiper.sh-fix-stat-path.patch @@ -0,0 +1,38 @@ +From e233006ee212109d2a1401dac37a9a851cc493d8 Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Thu, 14 Dec 2017 15:23:47 +0800 +Subject: [PATCH] wiper.sh: fix stat path + +Fix the stat path for OE. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Yi Zhao +--- + wiper/wiper.sh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/wiper/wiper.sh b/wiper/wiper.sh +index 79eddc8..9ef2840 100755 +--- a/wiper/wiper.sh ++++ b/wiper/wiper.sh +@@ -97,7 +97,6 @@ function find_prog(){ + hash -r ## Refresh bash's cached PATH entries + HDPARM=`find_prog /sbin/hdparm` || exit 1 + FIND=`find_prog /usr/bin/find` || exit 1 +-STAT=`find_prog /usr/bin/stat` || exit 1 + GAWK=`find_prog /usr/bin/gawk` || exit 1 + BLKID=`find_prog /sbin/blkid` || exit 1 + GREP=`find_prog /bin/grep` || exit 1 +@@ -105,7 +104,7 @@ ID=`find_prog /usr/bin/id` || exit 1 + LS=`find_prog /bin/ls` || exit 1 + DF=`find_prog /bin/df` || exit 1 + RM=`find_prog /bin/rm` || exit 1 +-STAT=`find_prog /usr/bin/stat` || exit 1 ++STAT=`find_prog /bin/stat` || exit 1 + + [ $verbose -gt 1 ] && HDPARM="$HDPARM --verbose" + +-- +2.7.4 + diff --git a/meta/recipes-extended/hdparm/hdparm_9.52.bb b/meta/recipes-extended/hdparm/hdparm_9.52.bb index 49fdc941a5..13cfb3fdf1 100644 --- a/meta/recipes-extended/hdparm/hdparm_9.52.bb +++ b/meta/recipes-extended/hdparm/hdparm_9.52.bb @@ -19,9 +19,11 @@ PACKAGES =+ "wiper" FILES_wiper = "${bindir}/wiper.sh" -RDEPENDS_wiper = "bash gawk stat" +RDEPENDS_wiper = "bash gawk coreutils" -SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/${BP}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/${BP}.tar.gz \ + file://wiper.sh-fix-stat-path.patch \ + " SRC_URI[md5sum] = "410539d0bf3cc247181594581edbfb53" SRC_URI[sha256sum] = "c3429cd423e271fa565bf584598fd751dd2e773bb7199a592b06b5a61cec4fb6" -- cgit 1.2.3-korg