Patchwork [5/5] rpm: save output of postinstall scripts when image first boot

login
register
mail settings
Submitter Kang Kai
Date Feb. 26, 2013, 8:14 a.m.
Message ID <0e45eb2f773f3985d6cc47e78775a26271806b30.1361866257.git.kai.kang@windriver.com>
Download mbox | patch
Permalink /patch/45093/
State Accepted
Commit 9ed59a5d1897354e9d4a6d1179db50c1e04435a3
Headers show

Comments

Kang Kai - Feb. 26, 2013, 8:14 a.m.
When image feature "debug-tweaks" is enabled, save output of post
install script to log file which can be configured when image first
boot.

[YOCTO #3223]

Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
 meta/recipes-devtools/rpm/rpm_5.4.9.bb |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
Kang Kai - March 6, 2013, 1:52 a.m.
On 2013?02?26? 16:14, Kang Kai wrote:
> When image feature "debug-tweaks" is enabled, save output of post
> install script to log file which can be configured when image first
> boot.
>
> [YOCTO #3223]
>
> Signed-off-by: Kang Kai<kai.kang@windriver.com>
> ---
>   meta/recipes-devtools/rpm/rpm_5.4.9.bb |    6 +++++-
>   1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
> index 0b014b6..cdfb5ff 100644
> --- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
> +++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
> @@ -223,6 +223,7 @@ FILES_${PN} =  "${bindir}/rpm \
>   		${libdir}/rpm/bin/wget \
>   		/var/lib/rpm \
>   		/var/cache/rpm \
> +		${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts \

Previous(4/5) patch has been merged to master but this one not, the 
bitbake complains:

WARNING: QA Issue: rpm: Files/directories were installed but not shipped
/etc
/etc/rcS.d
/etc/rcS.d/S98run-postinsts

This line should be split to the previous(4/5) patch. When this patch 
merged, the warning will disappear.

Sorry for this trouble,
Kai

>   		"
>
>   FILES_${PN}-dbg += "${libdir}/rpm/.debug \
> @@ -374,6 +375,9 @@ do_configure() {
>   #
>   POSTINSTALL_INITPOSITION ?= "98"
>
> +POSTLOG ?= "/var/log/postinstall.log"
> +REDIRECT_CMD = "${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '>>${POSTLOG} 2>&1', '', d)}"
> +
>   do_install_append() {
>   	sed -i -e 's,%__check_files,#%%__check_files,' ${D}/${libdir}/rpm/macros
>   	sed -i -e 's,%__scriptlet_requires,#%%__scriptlet_requires,' ${D}/${libdir}/rpm/macros
> @@ -459,7 +463,7 @@ do_install_append() {
>   for i in \`ls /etc/rpm-postinsts/\`; do
>   	i=/etc/rpm-postinsts/$i
>   	echo "Running postinst $i..."
> -	if [ -f $i ]&&  $i; then
> +	if [ -f $i ]&&  $i ${REDIRECT_CMD}; then
>   		rm $i
>   	else
>   		echo "ERROR: postinst $i failed."

Patch

diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
index 0b014b6..cdfb5ff 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
@@ -223,6 +223,7 @@  FILES_${PN} =  "${bindir}/rpm \
 		${libdir}/rpm/bin/wget \
 		/var/lib/rpm \
 		/var/cache/rpm \
+		${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts \
 		"
 
 FILES_${PN}-dbg += "${libdir}/rpm/.debug \
@@ -374,6 +375,9 @@  do_configure() {
 #
 POSTINSTALL_INITPOSITION ?= "98"
 
+POSTLOG ?= "/var/log/postinstall.log"
+REDIRECT_CMD = "${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '>>${POSTLOG} 2>&1', '', d)}"
+
 do_install_append() {
 	sed -i -e 's,%__check_files,#%%__check_files,' ${D}/${libdir}/rpm/macros
 	sed -i -e 's,%__scriptlet_requires,#%%__scriptlet_requires,' ${D}/${libdir}/rpm/macros
@@ -459,7 +463,7 @@  do_install_append() {
 for i in \`ls /etc/rpm-postinsts/\`; do
 	i=/etc/rpm-postinsts/$i
 	echo "Running postinst $i..."
-	if [ -f $i ] && $i; then
+	if [ -f $i ] && $i ${REDIRECT_CMD}; then
 		rm $i
 	else
 		echo "ERROR: postinst $i failed."