* [PATCH 0/3] run-postinsts fixes
@ 2013-07-19 9:39 Qi.Chen
2013-07-19 9:39 ` [PATCH 1/3] rpm: remove the obsolete rpm-postinsts.bb Qi.Chen
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Qi.Chen @ 2013-07-19 9:39 UTC (permalink / raw)
To: openembedded-core; +Cc: qingtao.cao
From: Chen Qi <Qi.Chen@windriver.com>
The following changes since commit 31e6eee860b5f9f4ac9ef0889bcff5648de6e3f9:
poky-tiny.conf: blacklist core-image-weston option (2013-07-18 21:26:58 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib ChenQi/run-postinsts-fixes
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/run-postinsts-fixes
Chen Qi (3):
rpm: remove the obsolete rpm-postinsts.bb
run-postinsts: fix comment
run-postinsts: add more logging to the log file to make things
clearer
meta/recipes-devtools/rpm/rpm-postinsts.bb | 54 --------------------
.../run-postinsts/run-postinsts/run-postinsts | 6 ++-
2 files changed, 4 insertions(+), 56 deletions(-)
delete mode 100644 meta/recipes-devtools/rpm/rpm-postinsts.bb
--
1.7.9.5
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/3] rpm: remove the obsolete rpm-postinsts.bb 2013-07-19 9:39 [PATCH 0/3] run-postinsts fixes Qi.Chen @ 2013-07-19 9:39 ` Qi.Chen 2013-07-22 23:49 ` Saul Wold 2013-07-19 9:39 ` [PATCH 2/3] run-postinsts: fix comment Qi.Chen 2013-07-19 9:39 ` [PATCH 3/3] run-postinsts: add more logging to the log file to make things clearer Qi.Chen 2 siblings, 1 reply; 6+ messages in thread From: Qi.Chen @ 2013-07-19 9:39 UTC (permalink / raw) To: openembedded-core; +Cc: qingtao.cao From: Chen Qi <Qi.Chen@windriver.com> Now that the postinsts of rpm, deb and ipk are all handled in the one central place, run-postinsts.bb, the rpm-postinsts.bb recipe is actually obsolete now. Remove this recipe to avoid confusion. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> --- meta/recipes-devtools/rpm/rpm-postinsts.bb | 54 ---------------------------- 1 file changed, 54 deletions(-) delete mode 100644 meta/recipes-devtools/rpm/rpm-postinsts.bb diff --git a/meta/recipes-devtools/rpm/rpm-postinsts.bb b/meta/recipes-devtools/rpm/rpm-postinsts.bb deleted file mode 100644 index ba58cd4..0000000 --- a/meta/recipes-devtools/rpm/rpm-postinsts.bb +++ /dev/null @@ -1,54 +0,0 @@ -DESCRIPTION = "RPM postinstall script" -SECTION = "core" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780" - -inherit allarch -# -# Allow distributions to alter when [postponed] package install scripts are run -# -POSTINSTALL_INITPOSITION ?= "98" - -do_fetch() { - : -} - -do_configure() { - : -} - -do_compile() { - : -} - -do_install() { - : -} - -pkg_postinst_${PN} () { -if [ "x$D" != "x" ] && [ -f $D/var/lib/rpm/Packages ]; then - install -d $D/${sysconfdir}/rcS.d - cat > $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts << "EOF" -#!/bin/sh -[ -e ${sysconfdir}/default/postinst ] && . ${sysconfdir}/default/postinst -[ -d ${sysconfdir}/rpm-postinsts ] && for i in `ls ${sysconfdir}/rpm-postinsts/`; do - i=${sysconfdir}/rpm-postinsts/$i - echo "Running postinst $i..." - if [ -x $i ]; then - if [ "$POSTINST_LOGGING" = "1" ]; then - $i >>$LOGFILE 2>&1 - else - $i - fi - rm $i - else - echo "ERROR: postinst $i failed." - fi -done -rm -f ${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts 2>/dev/null -EOF - chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts -fi -} - -ALLOW_EMPTY_${PN} = "1" -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] rpm: remove the obsolete rpm-postinsts.bb 2013-07-19 9:39 ` [PATCH 1/3] rpm: remove the obsolete rpm-postinsts.bb Qi.Chen @ 2013-07-22 23:49 ` Saul Wold 2013-07-23 2:04 ` ChenQi 0 siblings, 1 reply; 6+ messages in thread From: Saul Wold @ 2013-07-22 23:49 UTC (permalink / raw) To: Qi.Chen; +Cc: qingtao.cao, openembedded-core On 07/19/2013 02:39 AM, Qi.Chen@windriver.com wrote: > From: Chen Qi <Qi.Chen@windriver.com> > > Now that the postinsts of rpm, deb and ipk are all handled in the one > central place, run-postinsts.bb, the rpm-postinsts.bb recipe is actually > obsolete now. Remove this recipe to avoid confusion. > There still seems to be references to rpm-postinsts in the rootfs_rpm, package_rpm and image.bb, while these seem unused, we should clean these all up at the same time. Sau! > Signed-off-by: Chen Qi <Qi.Chen@windriver.com> > --- > meta/recipes-devtools/rpm/rpm-postinsts.bb | 54 ---------------------------- > 1 file changed, 54 deletions(-) > delete mode 100644 meta/recipes-devtools/rpm/rpm-postinsts.bb > > diff --git a/meta/recipes-devtools/rpm/rpm-postinsts.bb b/meta/recipes-devtools/rpm/rpm-postinsts.bb > deleted file mode 100644 > index ba58cd4..0000000 > --- a/meta/recipes-devtools/rpm/rpm-postinsts.bb > +++ /dev/null > @@ -1,54 +0,0 @@ > -DESCRIPTION = "RPM postinstall script" > -SECTION = "core" > -LICENSE = "LGPLv2.1" > -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780" > - > -inherit allarch > -# > -# Allow distributions to alter when [postponed] package install scripts are run > -# > -POSTINSTALL_INITPOSITION ?= "98" > - > -do_fetch() { > - : > -} > - > -do_configure() { > - : > -} > - > -do_compile() { > - : > -} > - > -do_install() { > - : > -} > - > -pkg_postinst_${PN} () { > -if [ "x$D" != "x" ] && [ -f $D/var/lib/rpm/Packages ]; then > - install -d $D/${sysconfdir}/rcS.d > - cat > $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts << "EOF" > -#!/bin/sh > -[ -e ${sysconfdir}/default/postinst ] && . ${sysconfdir}/default/postinst > -[ -d ${sysconfdir}/rpm-postinsts ] && for i in `ls ${sysconfdir}/rpm-postinsts/`; do > - i=${sysconfdir}/rpm-postinsts/$i > - echo "Running postinst $i..." > - if [ -x $i ]; then > - if [ "$POSTINST_LOGGING" = "1" ]; then > - $i >>$LOGFILE 2>&1 > - else > - $i > - fi > - rm $i > - else > - echo "ERROR: postinst $i failed." > - fi > -done > -rm -f ${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts 2>/dev/null > -EOF > - chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts > -fi > -} > - > -ALLOW_EMPTY_${PN} = "1" > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] rpm: remove the obsolete rpm-postinsts.bb 2013-07-22 23:49 ` Saul Wold @ 2013-07-23 2:04 ` ChenQi 0 siblings, 0 replies; 6+ messages in thread From: ChenQi @ 2013-07-23 2:04 UTC (permalink / raw) To: Saul Wold; +Cc: qingtao.cao, openembedded-core On 07/23/2013 07:49 AM, Saul Wold wrote: > On 07/19/2013 02:39 AM, Qi.Chen@windriver.com wrote: >> From: Chen Qi <Qi.Chen@windriver.com> >> >> Now that the postinsts of rpm, deb and ipk are all handled in the one >> central place, run-postinsts.bb, the rpm-postinsts.bb recipe is actually >> obsolete now. Remove this recipe to avoid confusion. >> > There still seems to be references to rpm-postinsts in the rootfs_rpm, > package_rpm and image.bb, while these seem unused, we should clean > these all up at the same time. > Hi Saul, I checked these classes, no reference to the rpm-postinsts recipe. And we can see that the ROOTFS_PKGMANAGE_BOOTSTRAP has been changed to 'run-postinsts'. meta/classes/rootfs_rpm.bbclass:ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts" There are references to the /etc/rpm-postinsts directory which is actually handled by run-postinsts.bb recipe now. Best Regards, Chen Qi > > Sau! > >> Signed-off-by: Chen Qi <Qi.Chen@windriver.com> >> --- >> meta/recipes-devtools/rpm/rpm-postinsts.bb | 54 >> ---------------------------- >> 1 file changed, 54 deletions(-) >> delete mode 100644 meta/recipes-devtools/rpm/rpm-postinsts.bb >> >> diff --git a/meta/recipes-devtools/rpm/rpm-postinsts.bb >> b/meta/recipes-devtools/rpm/rpm-postinsts.bb >> deleted file mode 100644 >> index ba58cd4..0000000 >> --- a/meta/recipes-devtools/rpm/rpm-postinsts.bb >> +++ /dev/null >> @@ -1,54 +0,0 @@ >> -DESCRIPTION = "RPM postinstall script" >> -SECTION = "core" >> -LICENSE = "LGPLv2.1" >> -LIC_FILES_CHKSUM = >> "file://${COREBASE}/meta/files/common-licenses/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780" >> - >> -inherit allarch >> -# >> -# Allow distributions to alter when [postponed] package install >> scripts are run >> -# >> -POSTINSTALL_INITPOSITION ?= "98" >> - >> -do_fetch() { >> - : >> -} >> - >> -do_configure() { >> - : >> -} >> - >> -do_compile() { >> - : >> -} >> - >> -do_install() { >> - : >> -} >> - >> -pkg_postinst_${PN} () { >> -if [ "x$D" != "x" ] && [ -f $D/var/lib/rpm/Packages ]; then >> - install -d $D/${sysconfdir}/rcS.d >> - cat > >> $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts << "EOF" >> -#!/bin/sh >> -[ -e ${sysconfdir}/default/postinst ] && . >> ${sysconfdir}/default/postinst >> -[ -d ${sysconfdir}/rpm-postinsts ] && for i in `ls >> ${sysconfdir}/rpm-postinsts/`; do >> - i=${sysconfdir}/rpm-postinsts/$i >> - echo "Running postinst $i..." >> - if [ -x $i ]; then >> - if [ "$POSTINST_LOGGING" = "1" ]; then >> - $i >>$LOGFILE 2>&1 >> - else >> - $i >> - fi >> - rm $i >> - else >> - echo "ERROR: postinst $i failed." >> - fi >> -done >> -rm -f ${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts >> 2>/dev/null >> -EOF >> - chmod 0755 >> $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts >> -fi >> -} >> - >> -ALLOW_EMPTY_${PN} = "1" >> > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/3] run-postinsts: fix comment 2013-07-19 9:39 [PATCH 0/3] run-postinsts fixes Qi.Chen 2013-07-19 9:39 ` [PATCH 1/3] rpm: remove the obsolete rpm-postinsts.bb Qi.Chen @ 2013-07-19 9:39 ` Qi.Chen 2013-07-19 9:39 ` [PATCH 3/3] run-postinsts: add more logging to the log file to make things clearer Qi.Chen 2 siblings, 0 replies; 6+ messages in thread From: Qi.Chen @ 2013-07-19 9:39 UTC (permalink / raw) To: openembedded-core; +Cc: qingtao.cao From: Chen Qi <Qi.Chen@windriver.com> The run-postinsts script also handles the #SYSCONFDIR#/rpm-postinsts directory. Add it to the comment for clarity. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> --- .../run-postinsts/run-postinsts/run-postinsts | 4 ++-- 1 file 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 d1bf582..2a8d1d6 100755 --- a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts +++ b/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts @@ -5,8 +5,8 @@ # Author: Richard Purdie <rpurdie@openedhand.com> # -# The following script will run all the scriptlets found in #SYSCONFDIR#/deb-postinsts or -# #SYSCONFDIR#/ipk-postinsts +# The following script will run all the scriptlets found in #SYSCONFDIR#/deb-postinsts, +# #SYSCONFDIR#/ipk-postinsts or #SYSCONFDIR#/rpm-posinsts. pi_dir="" for pm in rpm deb ipk; do -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] run-postinsts: add more logging to the log file to make things clearer 2013-07-19 9:39 [PATCH 0/3] run-postinsts fixes Qi.Chen 2013-07-19 9:39 ` [PATCH 1/3] rpm: remove the obsolete rpm-postinsts.bb Qi.Chen 2013-07-19 9:39 ` [PATCH 2/3] run-postinsts: fix comment Qi.Chen @ 2013-07-19 9:39 ` Qi.Chen 2 siblings, 0 replies; 6+ messages in thread From: Qi.Chen @ 2013-07-19 9:39 UTC (permalink / raw) To: openembedded-core; +Cc: qingtao.cao From: Chen Qi <Qi.Chen@windriver.com> When all postinsts scripts succeed at system startup, it's very possible that the log file /var/log/postinstall.log is empty. This is kind of confusing, as that file is supposed to hold information about the postinsts. Add more logging to the log file to make things clearer. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> --- .../run-postinsts/run-postinsts/run-postinsts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts b/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts index 2a8d1d6..c94c3e9 100755 --- a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts +++ b/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts @@ -24,6 +24,7 @@ remove_pi_dir=1 for i in `ls $pi_dir`; do i=$pi_dir/$i echo "Running postinst $i..." + [ "$POSTINST_LOGGING" = "1" ] && echo "Running postinst $i..." >> $LOGFILE if [ -x $i ]; then if [ "$POSTINST_LOGGING" = "1" ]; then sh -c $i >>$LOGFILE 2>&1 @@ -33,6 +34,7 @@ for i in `ls $pi_dir`; do rm $i else echo "ERROR: postinst $i failed." + [ "$POSTINST_LOGGING" = "1" ] && echo "ERROR: postinst $i failed." >> $LOGFILE remove_pi_dir=0 fi done -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-07-23 2:04 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-07-19 9:39 [PATCH 0/3] run-postinsts fixes Qi.Chen 2013-07-19 9:39 ` [PATCH 1/3] rpm: remove the obsolete rpm-postinsts.bb Qi.Chen 2013-07-22 23:49 ` Saul Wold 2013-07-23 2:04 ` ChenQi 2013-07-19 9:39 ` [PATCH 2/3] run-postinsts: fix comment Qi.Chen 2013-07-19 9:39 ` [PATCH 3/3] run-postinsts: add more logging to the log file to make things clearer Qi.Chen
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox