diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-10-07 10:31:22 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-10-07 18:27:57 +0200 |
| commit | 83edc15d8efe689e70ddfa5141d1e0198d047a33 (patch) | |
| tree | e3f4f1f1d6fba52f919295fd78f7cd4697c61266 | |
| parent | 5349dc0a538ad9e18dc1315582b1407600d8731a (diff) | |
| download | ptxdist-83edc15d8efe689e70ddfa5141d1e0198d047a33.tar.gz ptxdist-83edc15d8efe689e70ddfa5141d1e0198d047a33.tar.xz | |
install_check: improve sanity check
The existing check only verifies if the xpkg was start at all.
This does not detect incorrect install commands for xpkgs that where
started by another package.
Improve this with a temporary file that contains package and xpkg.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/post/install.make | 2 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_xpkg_finish.sh | 1 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_xpkg_prepare.sh | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/rules/post/install.make b/rules/post/install.make index c0e24569e..0dcf43134 100644 --- a/rules/post/install.make +++ b/rules/post/install.make @@ -11,7 +11,7 @@ install_check = \ CMD="$(strip $(1))"; \ - if [ ! -f "$(STATEDIR)/$$XPKG.cmds" ]; then \ + if [ ! -f "$(PTXDIST_TEMPDIR)/$(notdir $(@)).$$XPKG" ]; then \ echo; \ echo "Error: install_init was not called for package '$$XPKG'!"; \ echo "This is probably caused by a typo in the package name of:"; \ diff --git a/scripts/lib/ptxd_make_xpkg_finish.sh b/scripts/lib/ptxd_make_xpkg_finish.sh index 3b1bd61d5..eb9040fb9 100644 --- a/scripts/lib/ptxd_make_xpkg_finish.sh +++ b/scripts/lib/ptxd_make_xpkg_finish.sh @@ -107,6 +107,7 @@ EOF echo -e "\nxpkg_finish: failed.\n" return ${ret} } + rm -f ${PTXDIST_TEMPDIR}/${pkg_stamp}.${pkg_xpkg} echo -e "\nxpkg_finish: done.\n" } export -f ptxd_make_xpkg_finish diff --git a/scripts/lib/ptxd_make_xpkg_prepare.sh b/scripts/lib/ptxd_make_xpkg_prepare.sh index 38d053d0e..cf231465b 100644 --- a/scripts/lib/ptxd_make_xpkg_prepare.sh +++ b/scripts/lib/ptxd_make_xpkg_prepare.sh @@ -110,5 +110,6 @@ install_init: @DEPENDS@ -> ${dep}" echo "not available" fi done + touch ${PTXDIST_TEMPDIR}/${pkg_stamp}.${pkg_xpkg} } export -f ptxd_make_xpkg_prepare |