diff options
-rw-r--r-- | meta/conf/layer.conf | 1 | ||||
-rwxr-xr-x | meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts | 11 | ||||
-rw-r--r-- | meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index 62f86f361a..efbf2610f9 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf | |||
@@ -87,6 +87,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ | |||
87 | sato-icon-theme->gtk+3 \ | 87 | sato-icon-theme->gtk+3 \ |
88 | adwaita-icon-theme->gdk-pixbuf \ | 88 | adwaita-icon-theme->gdk-pixbuf \ |
89 | adwaita-icon-theme->gtk+3 \ | 89 | adwaita-icon-theme->gtk+3 \ |
90 | run-postinsts->util-linux \ | ||
90 | " | 91 | " |
91 | 92 | ||
92 | # Avoid adding bison-native to the sysroot without a specific | 93 | # Avoid adding bison-native to the sysroot without a specific |
diff --git a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts b/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts index 95dccb9cae..1f3e692029 100755 --- a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts +++ b/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts | |||
@@ -81,11 +81,18 @@ remove_rcsd_link=1 | |||
81 | if $pm_installed; then | 81 | if $pm_installed; then |
82 | case $pm in | 82 | case $pm in |
83 | "ipk") | 83 | "ipk") |
84 | eval opkg configure $append_log | 84 | if ! `fcntl-lock --wait 30 /run/opkg.lock true`; then |
85 | eval echo "Unable to obtain the opkg lock, deadlock?" $append_log | ||
86 | fi | ||
87 | if ! eval "opkg configure $append_log"; then | ||
88 | exit 1 | ||
89 | fi | ||
85 | ;; | 90 | ;; |
86 | 91 | ||
87 | "deb") | 92 | "deb") |
88 | eval dpkg --configure -a $append_log | 93 | if ! eval "eval dpkg --configure -a $append_log"; then |
94 | exit 1 | ||
95 | fi | ||
89 | ;; | 96 | ;; |
90 | esac | 97 | esac |
91 | else | 98 | else |
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 72ba8c0227..e977942de8 100644 --- a/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb +++ b/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb | |||
@@ -12,6 +12,8 @@ S = "${WORKDIR}" | |||
12 | 12 | ||
13 | inherit allarch systemd update-rc.d | 13 | inherit allarch systemd update-rc.d |
14 | 14 | ||
15 | RDEPENDS:${PN} = "util-linux-fcntl-lock" | ||
16 | |||
15 | INITSCRIPT_NAME = "run-postinsts" | 17 | INITSCRIPT_NAME = "run-postinsts" |
16 | INITSCRIPT_PARAMS = "start 99 S ." | 18 | INITSCRIPT_PARAMS = "start 99 S ." |
17 | 19 | ||