* [CONSOLIDATED PULL 1/9] qt-mobility: qa_configure stage failed
2011-11-11 8:36 [CONSOLIDATED PULL 0/9] RPM Fixes and others Saul Wold
@ 2011-11-11 8:36 ` Saul Wold
2011-11-11 8:36 ` [CONSOLIDATED PULL 2/9] rootfs_rpm.bbclass: Enable pre and post install scripts Saul Wold
` (8 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2011-11-11 8:36 UTC (permalink / raw)
To: openembedded-core
From: Dmitry Cherukhin <dima_ch@emcraft.com>
The catalogue /usr/lib removed from Makefiles used for building configure tests.
Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
---
.../qt4/files/qt-mobility-configure.patch | 17 +++++++++++++++++
meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 3 ++-
2 files changed, 19 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-qt/qt4/files/qt-mobility-configure.patch
diff --git a/meta/recipes-qt/qt4/files/qt-mobility-configure.patch b/meta/recipes-qt/qt4/files/qt-mobility-configure.patch
new file mode 100644
index 0000000..d61ec03
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/qt-mobility-configure.patch
@@ -0,0 +1,17 @@
+When building qt-mobility, the qa_configure stage failed because the catalogue /usr/lib
+is used in some Makefiles within configure tests. We manually removed this catalogue.
+
+Upstream-Status: Inappropriate [embedded]
+Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
+
+--- qt-mobility-opensource-src-1.2.0/configure.orig 2011-05-10 10:06:01.000000000 +0200
++++ qt-mobility-opensource-src-1.2.0/configure 2011-11-08 12:34:56.347645968 +0100
+@@ -583,6 +583,8 @@
+ fi
+
+ $QMAKE_EXEC $QMKSPEC "$relpath/config.tests/$2/$2.pro" 2>> "$CONFIG_LOG" >> "$CONFIG_LOG"
++ cp Makefile Makefile.old
++ sed -e 's@-L/usr/lib@@' <Makefile.old >Makefile
+ printf " ."
+ "$MAKE" clean >> "$CONFIG_LOG"
+ printf "."
diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
index f665e64..11aad8b 100644
--- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -5,7 +5,8 @@ LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
-SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz "
+SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz \
+ file://qt-mobility-configure.patch "
SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"
SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [CONSOLIDATED PULL 2/9] rootfs_rpm.bbclass: Enable pre and post install scripts
2011-11-11 8:36 [CONSOLIDATED PULL 0/9] RPM Fixes and others Saul Wold
2011-11-11 8:36 ` [CONSOLIDATED PULL 1/9] qt-mobility: qa_configure stage failed Saul Wold
@ 2011-11-11 8:36 ` Saul Wold
2011-11-11 8:36 ` [CONSOLIDATED PULL 3/9] rootfs_rpm.bbclass: Turn off script debugging Saul Wold
` (7 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2011-11-11 8:36 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
[YOCTO #1755]
We change the want the RPM rootfs install works to install pre and post install
scripts. The new method uses a script helper that is invoked by RPM outside
of the normal chroot.
The wrapper is dynamically generated prior to the install starting. It will
check the return code of the script. If the script fails, it will store a copy
to be executed on the first system boot. This is similar to the previous
mechanism.
In addition, a line of debug was added to the scripts as written by package_rpm
to list which package and which script for later debugging, if necessary.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/classes/package_rpm.bbclass | 33 ++++-
meta/classes/rootfs_rpm.bbclass | 25 +---
.../rpm/rpm/rpm-scriptletexechelper.patch | 159 ++++++++++++++++++++
meta/recipes-devtools/rpm/rpm_5.4.0.bb | 3 +-
4 files changed, 199 insertions(+), 21 deletions(-)
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 2c5545c..2ace053 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -382,13 +382,39 @@ package_install_internal_rpm () {
cat ${target_rootfs}/install/install_solution.manifest > ${target_rootfs}/install/total_solution.manifest
cat ${target_rootfs}/install/install_multilib_solution.manifest >> ${target_rootfs}/install/total_solution.manifest
+ # Construct install scriptlet wrapper
+ cat << EOF > ${WORKDIR}/scriptlet_wrapper
+#!/bin/bash
+
+export PATH="${PATH}"
+export D="${target_rootfs}"
+export OFFLINE_ROOT="\$D"
+export IPKG_OFFLINE_ROOT="\$D"
+export OPKG_OFFLINE_ROOT="\$D"
+
+\$2 \$1/\$3 \$4
+if [ \$? -ne 0 ]; then
+ mkdir -p \$1/etc/rpm-postinsts
+ num=100
+ while [ -e \$1/etc/rpm-postinsts/\${num} ]; do num=\$((num + 1)); done
+ echo "#!\$2" > \$1/etc/rpm-postinsts/\${num}
+ echo "# Arg: \$4" >> \$1/etc/rpm-postinsts/\${num}
+ cat \$1/\$3 >> \$1/etc/rpm-postinsts/\${num}
+ chmod +x \$1/etc/rpm-postinsts/\${num}
+fi
+EOF
+
+ chmod 0755 ${WORKDIR}/scriptlet_wrapper
+
# Attempt install
${RPM} --root ${target_rootfs} \
--predefine "_rpmds_sysinfo_path ${target_rootfs}/etc/rpm/sysinfo" \
--predefine "_rpmrc_platform_path ${target_rootfs}/etc/rpm/platform" \
+ -D "_var ${localstatedir}" \
-D "_dbpath ${rpmlibdir}" \
- --noscripts --notriggers --noparentdirs --nolinktos --replacepkgs \
+ --noparentdirs --nolinktos --replacepkgs \
-D "__dbi_txn create nofsync private" \
+ -D "_cross_scriptlet_wrapper ${WORKDIR}/scriptlet_wrapper" \
-Uhv ${target_rootfs}/install/total_solution.manifest
}
@@ -685,6 +711,7 @@ python write_specfile () {
elif script == 'postrm':
spec_scriptlets_bottom.append('%%postun -n %s' % splitname)
scriptvar = wrap_uninstall(scriptvar)
+ spec_scriptlets_bottom.append('# %s - %s' % (splitname, script))
spec_scriptlets_bottom.append(scriptvar)
spec_scriptlets_bottom.append('')
@@ -762,19 +789,23 @@ python write_specfile () {
if srcpreinst:
spec_scriptlets_top.append('%pre')
+ spec_scriptlets_top.append('# %s - preinst' % srcname)
spec_scriptlets_top.append(srcpreinst)
spec_scriptlets_top.append('')
if srcpostinst:
spec_scriptlets_top.append('%post')
+ spec_scriptlets_top.append('# %s - postinst' % srcname)
spec_scriptlets_top.append(srcpostinst)
spec_scriptlets_top.append('')
if srcprerm:
spec_scriptlets_top.append('%preun')
+ spec_scriptlets_top.append('# %s - prerm' % srcname)
scriptvar = wrap_uninstall(srcprerm)
spec_scriptlets_top.append(scriptvar)
spec_scriptlets_top.append('')
if srcpostrm:
spec_scriptlets_top.append('%postun')
+ spec_scriptlets_top.append('# %s - postrm' % srcname)
scriptvar = wrap_uninstall(srcpostrm)
spec_scriptlets_top.append(scriptvar)
spec_scriptlets_top.append('')
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 95e9455..b3875a4 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -20,8 +20,6 @@ do_rootfs[depends] += "opkg-native:do_populate_sysroot"
do_rootfs[recrdeptask] += "do_package_write_rpm"
-AWKPOSTINSTSCRIPT = "${COREBASE}/scripts/rootfs_rpm-extract-postinst.awk"
-
RPM_PREPROCESS_COMMANDS = "package_update_index_rpm; package_generate_rpm_conf; "
RPM_POSTPROCESS_COMMANDS = ""
@@ -108,19 +106,9 @@ EOF
${ROOTFS_POSTINSTALL_COMMAND}
- mkdir -p ${IMAGE_ROOTFS}/etc/rpm-postinsts/
- ${RPM} --root ${IMAGE_ROOTFS} -D '_dbpath ${rpmlibdir}' -qa \
- -D "__dbi_txn create nofsync private" \
- --qf 'Name: %{NAME}\n%|POSTIN?{postinstall scriptlet%|POSTINPROG?{ (using %{POSTINPROG})}|:\n%{POSTIN}\n}:{%|POSTINPROG?{postinstall program: %{POSTINPROG}\n}|}|' \
- > ${IMAGE_ROOTFS}/etc/rpm-postinsts/combined
- awk -f ${AWKPOSTINSTSCRIPT} < ${IMAGE_ROOTFS}/etc/rpm-postinsts/combined
- rm ${IMAGE_ROOTFS}/etc/rpm-postinsts/combined
-
- for i in ${IMAGE_ROOTFS}/etc/rpm-postinsts/*.sh; do
- if [ -f $i ] && sh $i; then
- # rm $i
- mv $i $i.done
- fi
+ # Report delayed package scriptlets
+ for i in ${IMAGE_ROOTFS}/etc/rpm-postinsts/*; do
+ echo "Delayed package scriptlet: `head -n 3 $i | tail -n 1`"
done
install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
@@ -128,11 +116,10 @@ EOF
i=\$i
cat > ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure << EOF
#!/bin/sh
-for i in /etc/rpm-postinsts/*.sh; do
+for i in /etc/rpm-postinsts/*; do
echo "Running postinst $i..."
- if [ -f $i ] && sh $i; then
- # rm $i
- mv $i $i.done
+ if [ -f $i ] && $i; then
+ rm $i
else
echo "ERROR: postinst $i failed."
fi
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch b/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch
new file mode 100644
index 0000000..e4db0e4
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch
@@ -0,0 +1,159 @@
+Enable a cross-install scriptlet helper.
+
+The helper is called from outside of the chroot with the arguments:
+
+<root> <prog> <script> <arg1> [<arg2> ... <argN>]
+
+The helper script is used by oe-core to facilitate shell script actions that
+can not be run from within a chroot on a foreign target system during a
+cross install.
+
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+
+diff -ur rpm-5.4.0.orig/lib/psm.c rpm-5.4.0/lib/psm.c
+--- rpm-5.4.0.orig/lib/psm.c 2010-12-29 07:42:11.000000000 -0600
++++ rpm-5.4.0/lib/psm.c 2011-11-08 13:38:48.132791154 -0600
+@@ -792,6 +792,10 @@
+ int xx;
+ int i;
+
++#ifdef RPM_VENDOR_POKY
++ const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL);
++#endif
++
+ if (psm->sstates != NULL && ix >= 0 && ix < RPMSCRIPT_MAX)
+ ssp = psm->sstates + ix;
+ if (ssp != NULL)
+@@ -858,14 +862,29 @@
+ (F_ISSET(psm, UNORDERED) ? "a" : ""));
+
+ if (Phe->p.argv == NULL) {
+- argv = alloca(5 * sizeof(*argv));
+- argv[0] = "/bin/sh";
+- argc = 1;
++ argv = alloca(7 * sizeof(*argv));
++ argc = 0;
++ } else {
++ argv = alloca((Phe->c + 6) * sizeof(*argv));
++ argc = 0;
++ }
++
++#ifdef RPM_VENDOR_POKY
++ if (scriptletWrapper && *scriptletWrapper) {
++ argv[argc++] = scriptletWrapper;
++ argv[argc] = rpmtsRootDir(ts);
++ if (!argv[argc] || !*argv[argc])
++ argv[argc] = "/";
++ argc++;
++ }
++#endif
++
++ if (Phe->p.argv == NULL) {
++ argv[argc++] = "/bin/sh";
+ ldconfig_done = 0;
+ } else {
+- argv = alloca((Phe->c + 4) * sizeof(*argv));
+- memcpy(argv, Phe->p.argv, Phe->c * sizeof(*argv));
+- argc = Phe->c;
++ memcpy((argv + argc), Phe->p.argv, Phe->c * sizeof(*argv));
++ argc += Phe->c;
+ ldconfig_done = (ldconfig_path && !strcmp(argv[0], ldconfig_path)
+ ? 1 : 0);
+ }
+@@ -916,7 +935,12 @@
+ goto exit;
+
+ if (rpmIsDebug() &&
+- (!strcmp(argv[0], "/bin/sh") || !strcmp(argv[0], "/bin/bash")))
++ (!strcmp(argv[0], "/bin/sh") || !strcmp(argv[0], "/bin/bash"))
++#ifdef RPM_VENDOR_POKY
++ || (scriptletWrapper && *scriptletWrapper && !strcmp(argv[1], "/bin/sh"))
++ || (scriptletWrapper && *scriptletWrapper && !strcmp(argv[1], "/bin/bash"))
++#endif
++ )
+ {
+ static const char set_x[] = "set -x\n";
+ nw = Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd);
+@@ -1051,12 +1075,22 @@
+
+ { const char * rootDir = rpmtsRootDir(ts);
+ if (!rpmtsChrootDone(ts) && rootDir != NULL &&
++#ifdef RPM_VENDOR_POKY
++ !(scriptletWrapper && *scriptletWrapper) &&
++#endif
+ !(rootDir[0] == '/' && rootDir[1] == '\0'))
+ {
+ /*@-modobserver@*/
+ xx = Chroot(rootDir);
+ /*@=modobserver@*/
+ }
++#ifdef RPM_VENDOR_POKY
++ if (!rpmtsChrootDone(ts) && rootDir != NULL &&
++ (scriptletWrapper && *scriptletWrapper) &&
++ !(rootDir[0] == '/' && rootDir[1] == '\0'))
++ xx = Chdir(rootDir);
++ else
++#endif
+ xx = Chdir("/");
+ rpmlog(RPMLOG_DEBUG, D_("%s: %s(%s)\texecv(%s) pid %d\n"),
+ psm->stepName, sln, NVRA,
+@@ -2961,6 +2995,13 @@
+ case PSM_SCRIPT: /* Run current package scriptlets. */
+ /* XXX running %verifyscript/%sanitycheck doesn't have psm->te */
+ { rpmtxn _parent = (psm && psm->te ? psm->te->txn : NULL);
++
++#ifdef RPM_VENDOR_POKY
++ const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL);
++ if (scriptletWrapper && *scriptletWrapper)
++ rc = rpmpsmNext(psm, PSM_CHROOT_OUT);
++#endif
++
+ xx = rpmtxnBegin(rpmtsGetRdb(ts), _parent, NULL);
+ rc = runInstScript(psm);
+ if (rc)
+@@ -2968,11 +3009,24 @@
+ else
+ xx = rpmtxnCommit(rpmtsGetRdb(ts)->db_txn);
+ rpmtsGetRdb(ts)->db_txn = NULL;
++#ifdef RPM_VENDOR_POKY
++ if (scriptletWrapper && *scriptletWrapper)
++ rc = rpmpsmNext(psm, PSM_CHROOT_IN);
++#endif
+ } break;
+ case PSM_TRIGGERS:
+ /* Run triggers in other package(s) this package sets off. */
+ if (rpmtsFlags(ts) & RPMTRANS_FLAG_TEST) break;
++#ifdef RPM_VENDOR_POKY
++ const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL);
++ if (scriptletWrapper && *scriptletWrapper)
++ rc = rpmpsmNext(psm, PSM_CHROOT_OUT);
++#endif
+ rc = runTriggers(psm);
++#ifdef RPM_VENDOR_POKY
++ if (scriptletWrapper && *scriptletWrapper)
++ rc = rpmpsmNext(psm, PSM_CHROOT_IN);
++#endif
+ break;
+ case PSM_IMMED_TRIGGERS:
+ /* Run triggers in this package other package(s) set off. */
+@@ -2982,7 +3036,18 @@
+ F_SET(psm, GOTTRIGGERS);
+ }
+ if (psm->triggers != NULL)
++#ifdef RPM_VENDOR_POKY
++ {
++ const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL);
++ if (scriptletWrapper && *scriptletWrapper)
++ rc = rpmpsmNext(psm, PSM_CHROOT_OUT);
++#endif
+ rc = runImmedTriggers(psm);
++#ifdef RPM_VENDOR_POKY
++ if (scriptletWrapper && *scriptletWrapper)
++ rc = rpmpsmNext(psm, PSM_CHROOT_IN);
++ }
++#endif
+ break;
+
+ case PSM_RPMIO_FLAGS:
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index bbef0be..f8fe836 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -45,7 +45,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}"
extrarpmdeps = "python perl"
extrarpmdeps_virtclass-native = "file-native"
-PR = "r22"
+PR = "r23"
# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
# in order to extract the distribution SRPM into a format we can extract...
@@ -63,6 +63,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.0-0.20101229.src.rpm;ex
file://rpm-fileclass.patch \
file://rpm-canonarch.patch \
file://rpm-no-loopmsg.patch \
+ file://rpm-scriptletexechelper.patch \
file://pythondeps.sh \
"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [CONSOLIDATED PULL 3/9] rootfs_rpm.bbclass: Turn off script debugging
2011-11-11 8:36 [CONSOLIDATED PULL 0/9] RPM Fixes and others Saul Wold
2011-11-11 8:36 ` [CONSOLIDATED PULL 1/9] qt-mobility: qa_configure stage failed Saul Wold
2011-11-11 8:36 ` [CONSOLIDATED PULL 2/9] rootfs_rpm.bbclass: Enable pre and post install scripts Saul Wold
@ 2011-11-11 8:36 ` Saul Wold
2011-11-11 8:36 ` [CONSOLIDATED PULL 4/9] wpa-supplicant: Avoid blocking the post install script at cross rootfs time Saul Wold
` (6 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2011-11-11 8:36 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
Disable script debugging, as the log files become huge and take a
long time to process during the log check step. This results in a
performance improvement.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/classes/rootfs_rpm.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index b3875a4..6973008 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -44,7 +44,7 @@ RPM="rpm ${RPMOPTS}"
do_rootfs[lockfiles] += "${DEPLOY_DIR_RPM}/rpm.lock"
fakeroot rootfs_rpm_do_rootfs () {
- #set +x
+ set +x
${RPM_PREPROCESS_COMMANDS}
--
1.7.6.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [CONSOLIDATED PULL 4/9] wpa-supplicant: Avoid blocking the post install script at cross rootfs time.
2011-11-11 8:36 [CONSOLIDATED PULL 0/9] RPM Fixes and others Saul Wold
` (2 preceding siblings ...)
2011-11-11 8:36 ` [CONSOLIDATED PULL 3/9] rootfs_rpm.bbclass: Turn off script debugging Saul Wold
@ 2011-11-11 8:36 ` Saul Wold
2011-11-11 8:36 ` [CONSOLIDATED PULL 5/9] shadow: Generate the shadow files at rootfs construction Saul Wold
` (5 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2011-11-11 8:36 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
We only want to reload dbus, if we're install on the target -- not on the host.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../wpa-supplicant/wpa-supplicant-0.7.inc | 4 ++--
.../wpa-supplicant/wpa-supplicant_0.7.3.bb | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
index cd62d8f..ccdc4c3 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
@@ -66,9 +66,9 @@ do_install () {
}
pkg_postinst_wpa-supplicant () {
- # can't do this offline
+ # If we're offline, we don't need to do this.
if [ "x$D" != "x" ]; then
- exit 1
+ exit 0
fi
DBUSPID=`pidof dbus-daemon`
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
index 03bd937..98eba77 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
@@ -1,6 +1,6 @@
require wpa-supplicant-0.7.inc
-PR = "r4"
+PR = "r5"
SRC_URI[md5sum] = "f516f191384a9a546e3f5145c08addda"
SRC_URI[sha256sum] = "d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [CONSOLIDATED PULL 5/9] shadow: Generate the shadow files at rootfs construction
2011-11-11 8:36 [CONSOLIDATED PULL 0/9] RPM Fixes and others Saul Wold
` (3 preceding siblings ...)
2011-11-11 8:36 ` [CONSOLIDATED PULL 4/9] wpa-supplicant: Avoid blocking the post install script at cross rootfs time Saul Wold
@ 2011-11-11 8:36 ` Saul Wold
2011-11-11 8:36 ` [CONSOLIDATED PULL 6/9] sudo: Avoid post install scripts Saul Wold
` (4 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2011-11-11 8:36 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
With the recent changes to the shadow-native package support "--root",
we can now convert the passwd/group files to their shadow forms while
doing the rootfs install, instead of waiting to run on the target.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-extended/shadow/shadow_4.1.4.3.bb | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
index 5bc4a61..25330a4 100644
--- a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \
DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}"
-PR = "r4"
+PR = "r5"
SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \
file://login_defs_pam.sed \
@@ -128,11 +128,13 @@ pkg_postinst_${PN} () {
update-alternatives --install ${base_sbindir}/vigr vigr vigr.${PN} 200
if [ "x$D" != "x" ]; then
- exit 1
- fi
+ rootarg="--root=$D"
+ else
+ rootarg=""
+ fi
- pwconv
- grpconv
+ pwconv $rootarg
+ grpconv $rootarg
}
pkg_prerm_${PN} () {
--
1.7.6.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [CONSOLIDATED PULL 6/9] sudo: Avoid post install scripts
2011-11-11 8:36 [CONSOLIDATED PULL 0/9] RPM Fixes and others Saul Wold
` (4 preceding siblings ...)
2011-11-11 8:36 ` [CONSOLIDATED PULL 5/9] shadow: Generate the shadow files at rootfs construction Saul Wold
@ 2011-11-11 8:36 ` Saul Wold
2011-11-11 8:36 ` [CONSOLIDATED PULL 7/9] dhcp: generate initial leases files for server Saul Wold
` (3 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2011-11-11 8:36 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
The post install script was removed, and the install_append updated
to ensure the permissions are set correctly.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-extended/sudo/sudo.inc | 8 --------
meta/recipes-extended/sudo/sudo_1.8.3.bb | 5 ++++-
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
index 72a7c16..83dd209 100644
--- a/meta/recipes-extended/sudo/sudo.inc
+++ b/meta/recipes-extended/sudo/sudo.inc
@@ -29,11 +29,3 @@ do_install_prepend (){
mkdir -p ${D}/${localstatedir}/lib
}
-pkg_postinst_${PN} () {
- if [ "x$D" != "x" ]; then
- exit 1
- fi
-
- chmod 4111 /usr/bin/sudo
- chmod 0440 /etc/sudoers
-}
diff --git a/meta/recipes-extended/sudo/sudo_1.8.3.bb b/meta/recipes-extended/sudo/sudo_1.8.3.bb
index 0ac0851..99fe5b9 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.3.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.3.bb
@@ -1,6 +1,6 @@
require sudo.inc
-PR = "r0"
+PR = "r1"
SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
file://libtool.patch \
@@ -23,4 +23,7 @@ do_install_append () {
break
fi
done
+
+ chmod 4111 $D/usr/bin/sudo
+ chmod 0440 $D/etc/sudoers
}
--
1.7.6.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [CONSOLIDATED PULL 7/9] dhcp: generate initial leases files for server
2011-11-11 8:36 [CONSOLIDATED PULL 0/9] RPM Fixes and others Saul Wold
` (5 preceding siblings ...)
2011-11-11 8:36 ` [CONSOLIDATED PULL 6/9] sudo: Avoid post install scripts Saul Wold
@ 2011-11-11 8:36 ` Saul Wold
2011-11-11 9:33 ` Paul Eggleton
2011-11-11 8:36 ` [CONSOLIDATED PULL 8/9] util-linux: split mcookie into a package Saul Wold
` (2 subsequent siblings)
9 siblings, 1 reply; 13+ messages in thread
From: Saul Wold @ 2011-11-11 8:36 UTC (permalink / raw)
To: openembedded-core
From: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/recipes-connectivity/dhcp/dhcp.inc | 9 ++++++++-
meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
index 1cc529d..f9d80e7 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -51,13 +51,15 @@ do_install_append () {
mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/
fi
install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script
+
+ install -d ${D}${localstatedir}/lib/dhcp/
}
PACKAGES += "dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell"
FILES_${PN} = ""
-FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server"
+FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server ${localstatedir}/lib/dhcp/"
RRECOMMENDS_dhcp-server = "dhcp-server-config"
FILES_dhcp-server-config = "${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf"
@@ -68,3 +70,8 @@ FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${
RDEPENDS_dhcp-client = "bash"
FILES_dhcp-omshell = "${bindir}/omshell"
+
+pkg_postinst_dhcp-server() {
+ touch $D/${localstatedir}/lib/dhcp/dhcpd.leases
+ touch $D/${localstatedir}/lib/dhcp/dhcpd6.leases
+}
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
index 8ed7d76..2471d61 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
@@ -1,6 +1,6 @@
require dhcp.inc
-PR = "r3"
+PR = "r4"
SRC_URI += "file://fixincludes.patch \
file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
--
1.7.6.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [CONSOLIDATED PULL 8/9] util-linux: split mcookie into a package
2011-11-11 8:36 [CONSOLIDATED PULL 0/9] RPM Fixes and others Saul Wold
` (6 preceding siblings ...)
2011-11-11 8:36 ` [CONSOLIDATED PULL 7/9] dhcp: generate initial leases files for server Saul Wold
@ 2011-11-11 8:36 ` Saul Wold
2011-11-11 8:36 ` [CONSOLIDATED PULL 9/9] xinit: rdepends on util-linux-mcookie to avoid brining whole util-linux Saul Wold
2011-11-11 9:35 ` [CONSOLIDATED PULL 0/9] RPM Fixes and others Paul Menzel
9 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2011-11-11 8:36 UTC (permalink / raw)
To: openembedded-core
From: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/recipes-core/util-linux/util-linux.inc | 3 ++-
meta/recipes-core/util-linux/util-linux_2.19.1.bb | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 4db577c..dcf0ed9 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -30,7 +30,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
util-linux-mount util-linux-readprofile util-linux-libblkid \
util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \
- util-linux-chkdupexe util-linux-mkfs"
+ util-linux-chkdupexe util-linux-mkfs util-linux-mcookie"
EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown --enable-elvtune --enable-init --enable-kill --enable-last \
--enable-mesg --enable-partx --enable-raw --enable-rdev --enable-reset \
@@ -45,6 +45,7 @@ FILES_util-linux-sfdisk = "${sbindir}/sfdisk"
FILES_util-linux-swaponoff = "${base_sbindir}/swapon.${PN} ${sbindir}/swapoff.${PN}"
FILES_util-linux-losetup = "${base_sbindir}/losetup.${PN}"
FILES_util-linux-mount = "${base_bindir}/mount.${PN}"
+FILES_util-linux-mcookie = "${bindir}/mcookie"
FILES_util-linux-umount = "${base_bindir}/umount.${PN}"
FILES_util-linux-readprofile = "${base_sbindir}/readprofile.${PN}"
FILES_util-linux-uuidgen = "${bindir}/uuidgen"
diff --git a/meta/recipes-core/util-linux/util-linux_2.19.1.bb b/meta/recipes-core/util-linux/util-linux_2.19.1.bb
index fb5637e..e2fb727 100644
--- a/meta/recipes-core/util-linux/util-linux_2.19.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.19.1.bb
@@ -1,5 +1,5 @@
MAJOR_VERSION = "2.19"
-PR = "r9"
+PR = "r10"
require util-linux.inc
# note that `lscpu' is under GPLv3+
--
1.7.6.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [CONSOLIDATED PULL 9/9] xinit: rdepends on util-linux-mcookie to avoid brining whole util-linux
2011-11-11 8:36 [CONSOLIDATED PULL 0/9] RPM Fixes and others Saul Wold
` (7 preceding siblings ...)
2011-11-11 8:36 ` [CONSOLIDATED PULL 8/9] util-linux: split mcookie into a package Saul Wold
@ 2011-11-11 8:36 ` Saul Wold
2011-11-11 9:35 ` [CONSOLIDATED PULL 0/9] RPM Fixes and others Paul Menzel
9 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2011-11-11 8:36 UTC (permalink / raw)
To: openembedded-core
From: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/recipes-graphics/xorg-app/xinit_1.3.0.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/xorg-app/xinit_1.3.0.bb b/meta/recipes-graphics/xorg-app/xinit_1.3.0.bb
index 6953ccc..08dfe12 100644
--- a/meta/recipes-graphics/xorg-app/xinit_1.3.0.bb
+++ b/meta/recipes-graphics/xorg-app/xinit_1.3.0.bb
@@ -10,12 +10,12 @@ then terminate."
LIC_FILES_CHKSUM = "file://COPYING;md5=0d4b5eef75f1584ccbdc5e4a34314407"
-PR = "r1"
+PR = "r2"
PE = "1"
EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie"
-RDEPENDS_${PN} += "util-linux"
+RDEPENDS_${PN} += "util-linux-mcookie"
FILES_${PN} += "${libdir}X11/xinit"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [CONSOLIDATED PULL 0/9] RPM Fixes and others
2011-11-11 8:36 [CONSOLIDATED PULL 0/9] RPM Fixes and others Saul Wold
` (8 preceding siblings ...)
2011-11-11 8:36 ` [CONSOLIDATED PULL 9/9] xinit: rdepends on util-linux-mcookie to avoid brining whole util-linux Saul Wold
@ 2011-11-11 9:35 ` Paul Menzel
9 siblings, 0 replies; 13+ messages in thread
From: Paul Menzel @ 2011-11-11 9:35 UTC (permalink / raw)
To: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 392 bytes --]
Am Freitag, den 11.11.2011, 00:36 -0800 schrieb Saul Wold:
> This request includes Mark's changes along with some changes for qt-mobility
> and Otavio clean-ups.
Please amend Otavio’s patches as they lack the explanations required by
the guide lines, have spelling errors and also my Reviewed-by lines.
I composed the commit message in my replies!
[…]
Thanks,
Paul
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread