diff options
author | Niko Mauno <niko.mauno@iki.fi> | 2018-04-14 09:54:56 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-04-18 18:57:06 +0100 |
commit | 5514c292ea036e75f5cd8ffd409eba4709f19be6 (patch) | |
tree | dffeb4f643f900da7bed8d0a8c88a0b13d4f4d52 /meta/recipes-devtools/run-postinsts | |
parent | b8ce7d0800dc63db2786e2761b7ac97f7b59cd06 (diff) | |
download | poky-5514c292ea036e75f5cd8ffd409eba4709f19be6.tar.gz |
run-postinsts: Replace pi_dir variable test
Since commit 5159ddcb62682e1b7e63a20a9218ea96e3fe10a2 string length test
performed against pi_dir has effectively never been able to succeed.
Change this to rather test if pi_dir is not an existing directory. By
doing we remove the chance of seeing the following console error message
during first boot to a pristine rootfs:
'ls: /etc/ipk-postinsts: No such file or directory'
(From OE-Core rev: b1600ec8991dfbd3b73d209b9c620a171c5b13c4)
Signed-off-by: Niko Mauno <niko.mauno@iki.fi>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/run-postinsts')
-rwxr-xr-x | meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts b/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts index 50c0a1afea..307feb7187 100755 --- a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts +++ b/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts | |||
@@ -43,7 +43,7 @@ remove_rcsd_link () { | |||
43 | fi | 43 | fi |
44 | } | 44 | } |
45 | 45 | ||
46 | if [ -z "$pi_dir" ]; then | 46 | if ! [ -d $pi_dir ]; then |
47 | remove_rcsd_link | 47 | remove_rcsd_link |
48 | exit 0 | 48 | exit 0 |
49 | fi | 49 | fi |
diff --git a/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb b/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb index 31c98ec99c..85b3fc867e 100644 --- a/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb +++ b/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | SUMMARY = "Runs postinstall scripts on first boot of the target device" | 1 | SUMMARY = "Runs postinstall scripts on first boot of the target device" |
2 | SECTION = "devel" | 2 | SECTION = "devel" |
3 | PR = "r9" | 3 | PR = "r10" |
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 5 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
6 | 6 | ||