Skip to contentSkip to conversation

Updates and util-linux fix

PATCH In review Saul Wold 3 participants 14 messages Jul 3, 2013 – Jul 4, 2013

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

cover Updates and util-linux fix

The util-linux configure was finding pam in the core-image-basic image and there was a timing issue with and rebuild.

Other are standard updates

Sau!

The following changes since commit 3e1dbabbf33a2e461abc92ff10cd970fe604ee38:

sysstat: backport a patch to fix a parallel building error (2013-07-02 07:58:10 -0700)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib sgw/fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix

Saul Wold (8):
packagegroup-core-basic: Only build libpam if it's enabled
util-linux: disable runuser by default since it depends on PAM
help2man: Update to 1.43.3
boost: Update to 1.54
dtc: Update to 1.4.0 Git Tag
swabber: Update to latest head
remake: Update to latest 3.82_dbg-0.9 Tag
resolvconf: Update to 1.72

 .../resolvconf/{resolvconf_1.72.bb => resolvconf_1.73.bb}           | 4 ++--
 meta/recipes-core/util-linux/util-linux.inc                         | 3 ++-
 .../{help2man-native_1.43.2.bb => help2man-native_1.43.3.bb}        | 4 ++--
 meta/recipes-devtools/remake/remake_git.bb                          | 4 ++--
 meta/recipes-devtools/swabber/swabber-native_git.bb                 | 3 +--
 meta/recipes-extended/packagegroups/packagegroup-core-basic.bb      | 2 +-
 meta/recipes-kernel/dtc/dtc.inc                                     | 1 -
 meta/recipes-kernel/dtc/dtc_git.bb                                  | 5 ++---
 .../boost/{bjam-native_1.53.0.bb => bjam-native_1.54.0.bb}          | 0
 meta/recipes-support/boost/{boost-1.53.0.inc => boost-1.54.0.inc}   | 6 +++---
 meta/recipes-support/boost/{boost_1.53.0.bb => boost_1.54.0.bb}     | 2 --
 11 files changed, 15 insertions(+), 19 deletions(-)
 rename meta/recipes-connectivity/resolvconf/{resolvconf_1.72.bb => resolvconf_1.73.bb} (92%)
 rename meta/recipes-devtools/help2man/{help2man-native_1.43.2.bb => help2man-native_1.43.3.bb} (80%)
 rename meta/recipes-support/boost/{bjam-native_1.53.0.bb => bjam-native_1.54.0.bb} (100%)
 rename meta/recipes-support/boost/{boost-1.53.0.inc => boost-1.54.0.inc} (76%)
 rename meta/recipes-support/boost/{boost_1.53.0.bb => boost_1.54.0.bb} (89%)
Signature · 1 line
1.8.1.4
author
#1 lore raw

PATCH 1/8 packagegroup-core-basic: Only build libpam if it's enabled

util-linux will check for the exisitance of pam header files and change what is built, so only build libpam when pam is enabled for DISTRO_FEATURES

Signed-off-by Saul Wold <[email protected]>
---
 meta/recipes-extended/packagegroups/packagegroup-core-basic.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/packagegroups/packagegroup-core-basic.bb +1 -1
index c73d173..03dabbf 100644
@@ -104,7 +104,7 @@ RDEPENDS_packagegroup-core-multiuser = "\
     cracklib \
     gzip \
     libuser \
-    libpam \
+    ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \
     shadow \
     sudo \
     "
Signature · 1 line
1.8.1.4
author
#4 lore raw

PATCH 2/8 util-linux: disable runuser by default since it depends on PAM

In reply to Saul Wold

util-linux's configure checks for pam_misc.h and if it finds it will enable runuser, there was a case where it was found via shared state and then got rebuilt. This makes the build more deterministic.

Signed-off-by Saul Wold <[email protected]>
---
 meta/recipes-core/util-linux/util-linux.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-core/util-linux/util-linux.inc +2 -1
index 0ada1a5..5bae370 100644
@@ -45,6 +45,7 @@ EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \
                 --disable-vipw --disable-newgrp --disable-chfn-chsh --disable-su \
                 --enable-write --enable-arch --enable-mount --with-fsprobe=builtin \
                 --enable-libuuid --enable-libblkid --enable-fsck --without-udev \
+                --disable-runuser \
 		usrsbin_execdir='${sbindir}' \
 "
 

@@ -52,7 +53,7 @@ EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \
 EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--enable-socket-activation', '--disable-socket-activation', d)}"
 EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
 
-EXTRA_OECONF_append_class-native = " --disable-login --disable-su"
+EXTRA_OECONF_append_class-native = " --disable-login --disable-su --disable-runuser"
 
 FILES_${PN}-bash-completion += "${datadir}/bash-completion"
 FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*"
Signature · 1 line
1.8.1.4
author
#7 lore raw

PATCH 3/8 help2man: Update to 1.43.3

In reply to Saul Wold
Signed-off-by Saul Wold <[email protected]>
---
 .../help2man/{help2man-native_1.43.2.bb => help2man-native_1.43.3.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/help2man/{help2man-native_1.43.2.bb => help2man-native_1.43.3.bb} (80%)
meta/recipes-devtools/help2man/help2man-native_1.43.3.bb renamed from meta/recipes-devtools/help2man/help2man-native_1.43.2.bb +2 -2
similarity index 80%
rename from meta/recipes-devtools/help2man/help2man-native_1.43.2.bb
rename to meta/recipes-devtools/help2man/help2man-native_1.43.3.bb
index 22b235e..d20cee1 100644
@@ -6,8 +6,8 @@ DEPENDS = "autoconf-native automake-native"
 
 SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "bd816983f068ebcf8ca7a20463f7337d"
-SRC_URI[sha256sum] = "ec43eb74669e02cb61af142f1398bb882ff1dbbc9a8cc4f8cd70098fe425e4a9"
+SRC_URI[md5sum] = "a84868db7c139238df8add5d86a0b54f"
+SRC_URI[sha256sum] = "67978d118980ebd9f0c60be5db129527900a7b997b9568fc795ba9bdb341d303"
 
 inherit autotools native
Signature · 1 line
1.8.1.4
author
#9 lore raw

PATCH 5/8 dtc: Update to 1.4.0 Git Tag

In reply to Saul Wold
Signed-off-by Saul Wold <[email protected]>
---
 meta/recipes-kernel/dtc/dtc.inc    | 1 -
 meta/recipes-kernel/dtc/dtc_git.bb | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)
meta/recipes-kernel/dtc/dtc.inc +0 -1
index 18847c6..6888c55 100644
@@ -11,7 +11,6 @@ SRC_URI = "git://www.jdl.com/software/dtc.git;protocol=git \
 	  "
 
 EXTRA_OEMAKE='PREFIX="${prefix}" LIBDIR="${libdir}"'
-INC_PR = "r3"
 
 S = "${WORKDIR}/git"
meta/recipes-kernel/dtc/dtc_git.bb +2 -3
index c205de7..0bd3acf 100644
@@ -3,9 +3,8 @@ require dtc.inc
 LIC_FILES_CHKSUM = "file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
 		    file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c"
 
-SRCREV = "033089f29099bdfd5c2d6986cdb9fd07b16cfde0"
-PV = "1.3.0+git${SRCPV}"
-PR = "${INC_PR}.1"
+SRCREV = "65cc4d2748a2c2e6f27f1cf39e07a5dbabd80ebf"
+PV = "1.4.0+git${SRCPV}"
 
 S = "${WORKDIR}/git"
Signature · 1 line
1.8.1.4
author
#10 lore raw

PATCH 6/8 swabber: Update to latest head

In reply to Saul Wold
Signed-off-by Saul Wold <[email protected]>
---
 meta/recipes-devtools/swabber/swabber-native_git.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
meta/recipes-devtools/swabber/swabber-native_git.bb +1 -2
index 5bfe87f..9faae5d 100644
@@ -3,9 +3,8 @@ HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/swabber"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
 
-SRCREV = "a0792390c5d6d5a5bade7ab155c80eef3f30fa52"
+SRCREV = "2d1fe36fb0a4fdaae8823a9818a6785182d75e66"
 PV = "0.0+git${SRCPV}"
-PR = "r0"
 
 S = "${WORKDIR}/git"
Signature · 1 line
1.8.1.4
author
#11 lore raw

PATCH 7/8 remake: Update to latest 3.82_dbg-0.9 Tag

In reply to Saul Wold
Signed-off-by Saul Wold <[email protected]>
---
 meta/recipes-devtools/remake/remake_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/remake/remake_git.bb +2 -2
index afbc5d0..13d8ce9 100644
@@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 require remake.inc
 
 SRC_URI += "file://version-remake.texi.patch"
-SRCREV = "414d6e84121c6740ff5079370c905dea0f0e1ddb"
+SRCREV = "f05508e521987c8494c92d9c2871aec46307d51d"
 S = "${WORKDIR}/git"
 
-PV = "3.82+dbg-0.8+git${SRCPV}"
+PV = "3.82+dbg-0.9+git${SRCPV}"
 
 DEPENDS += "readline"
 PROVIDES += "make"
Signature · 1 line
1.8.1.4
author
#12 lore raw

PATCH 8/8 resolvconf: Update to 1.72

In reply to Saul Wold
Signed-off-by Saul Wold <[email protected]>
---
 .../resolvconf/{resolvconf_1.72.bb => resolvconf_1.73.bb}             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-connectivity/resolvconf/{resolvconf_1.72.bb => resolvconf_1.73.bb} (92%)
meta/recipes-connectivity/resolvconf/resolvconf_1.73.bb renamed from meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb +2 -2
similarity index 92%
rename from meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb
rename to meta/recipes-connectivity/resolvconf/resolvconf_1.73.bb
index 4fe70f5..ea5b6dd 100644
@@ -13,8 +13,8 @@ RDEPENDS_${PN} = "bash"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz"
 
-SRC_URI[md5sum] = "6bf631213c97f89261d997c78f7b9506"
-SRC_URI[sha256sum] = "196e8b5ef0a0282bf99e156113b058e65dd7f889cf4aea16597cddeef7e7cd43"
+SRC_URI[md5sum] = "1216bf45be4695e13d95ef5b63b76faa"
+SRC_URI[sha256sum] = "1147412c93e1ae9dc2bec43d3763ffada21dc00c1c7051b06543bd5d65629d09"
 
 inherit allarch
Signature · 1 line
1.8.1.4
author
#8 lore raw

PATCH 4/8 boost: Update to 1.54

In reply to Saul Wold
Signed-off-by Saul Wold <[email protected]>
---
 .../boost/{bjam-native_1.53.0.bb => bjam-native_1.54.0.bb}          | 0
 meta/recipes-support/boost/{boost-1.53.0.inc => boost-1.54.0.inc}   | 6 +++---
 meta/recipes-support/boost/{boost_1.53.0.bb => boost_1.54.0.bb}     | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)
 rename meta/recipes-support/boost/{bjam-native_1.53.0.bb => bjam-native_1.54.0.bb} (100%)
 rename meta/recipes-support/boost/{boost-1.53.0.inc => boost-1.54.0.inc} (76%)
 rename meta/recipes-support/boost/{boost_1.53.0.bb => boost_1.54.0.bb} (89%)
meta/recipes-support/boost/bjam-native_1.54.0.bb renamed from meta/recipes-support/boost/bjam-native_1.53.0.bb +0 -0
similarity index 100%
rename from meta/recipes-support/boost/bjam-native_1.53.0.bb
rename to meta/recipes-support/boost/bjam-native_1.54.0.bb
meta/recipes-support/boost/boost-1.54.0.inc renamed from meta/recipes-support/boost/boost-1.53.0.inc +3 -3
similarity index 76%
rename from meta/recipes-support/boost/boost-1.53.0.inc
rename to meta/recipes-support/boost/boost-1.54.0.inc
index dbcaabc..9113c82 100644
@@ -11,9 +11,9 @@ BOOST_VER = "${@"_".join(d.getVar("PV",1).split("."))}"
 BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}"
 BOOST_P = "boost_${BOOST_VER}"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BOOST_P}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2"
 
-SRC_URI[md5sum] = "a00d22605d5dbcfb4c9936a9b35bc4c2"
-SRC_URI[sha256sum] = "f88a041b01882b0c9c5c05b39603ec8383fb881f772f6f9e6e6fd0e0cddb9196"
+SRC_URI[md5sum] = "15cb8c0803064faef0c4ddf5bc5ca279"
+SRC_URI[sha256sum] = "047e927de336af106a24bceba30069980c191529fd76b8dff8eb9a328b48ae1d"
 
 S = "${WORKDIR}/${BOOST_P}"
meta/recipes-support/boost/boost_1.54.0.bb renamed from meta/recipes-support/boost/boost_1.53.0.bb +0 -2
similarity index 89%
rename from meta/recipes-support/boost/boost_1.53.0.bb
rename to meta/recipes-support/boost/boost_1.54.0.bb
index 3a5a6cc..68f483c 100644
@@ -1,7 +1,5 @@
 include boost-${PV}.inc
 include boost.inc
 
-PR = "r1"
-
 SRC_URI += "file://arm-intrinsics.patch \
            "
Signature · 1 line
1.8.1.4
#5 lore raw

Re: [PATCH 2/8] util-linux: disable runuser by default since it depends on PAM

In reply to Saul Wold
Quoted 11 lines · Saul Wold
meta/recipes-core/util-linux/util-linux.inc +1 -0
@@ -45,6 +45,7 @@ EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \
                 --disable-vipw --disable-newgrp --disable-chfn-chsh --disable-su \
                 --enable-write --enable-arch --enable-mount --with-fsprobe=builtin \
                 --enable-libuuid --enable-libblkid --enable-fsck --without-udev \
+                --disable-runuser \
                usrsbin_execdir='${sbindir}' \
 "

meta/recipes-core/util-linux/util-linux.inc EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \ · line 56

Quoted 5 lines
meta/recipes-core/util-linux/util-linux.inc +1 -1
@@ -52,7 +53,7 @@ EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \
 EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--enable-socket-activation', '--disable-socket-activation', d)}"
 EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
 
-EXTRA_OECONF_append_class-native = " --disable-login --disable-su"
+EXTRA_OECONF_append_class-native = " --disable-login --disable-su --disable-runuser"

Surely the class-native append is redundant?

Also, is runuser something that we should enable if the pam distro feature is enabled?

Ross

#2 lore raw

Re: [PATCH 1/8] packagegroup-core-basic: Only build libpam if it's enabled

In reply to Saul Wold
Quoted 13 lines · Saul Wold

util-linux will check for the exisitance of pam header files and change what is built, so only build libpam when pam is enabled for DISTRO_FEATURES

Signed-off-by Saul Wold <[email protected]>
---
 meta/recipes-extended/packagegroups/packagegroup-core-basic.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/packagegroups/packagegroup-core-basic.bb +0 -0
index c73d173..03dabbf 100644

meta/recipes-extended/packagegroups/packagegroup-core-basic.bb RDEPENDS_packagegroup-core-multiuser = "\ · line 110

Quoted 8 lines
meta/recipes-extended/packagegroups/packagegroup-core-basic.bb +1 -1
@@ -104,7 +104,7 @@ RDEPENDS_packagegroup-core-multiuser = "\
     cracklib \
     gzip \
     libuser \
-    libpam \
+    ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \
     shadow \
     sudo \
     "

Do we even need to mention libpam in here? If pam is enabled, shadow will have a runtime dependency on it.

Ross

#6 lore raw

Re: [PATCH 2/8] util-linux: disable runuser by default since it depends on PAM

In reply to Saul Wold
Quoted 5 lines · Saul Wold

util-linux's configure checks for pam_misc.h and if it finds it will enable runuser, there was a case where it was found via shared state and then got rebuilt. This makes the build more deterministic.

Signed-off-by Saul Wold <[email protected]>

Please make this as a PACKAGECONFIG and add it if pam feature is enabled.

--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750

#3 lore raw

Re: [PATCH 1/8] packagegroup-core-basic: Only build libpam if it's enabled

In reply to Burton, Ross
Quoted 9 lines · Ross
Quoted 8 lines · Saul Wold

util-linux will check for the exisitance of pam header files and change what is built, so only build libpam when pam is enabled for DISTRO_FEATURES

Signed-off-by Saul Wold <[email protected]>
---
 meta/recipes-extended/packagegroups/packagegroup-core-basic.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 16 lines

meta/recipes-extended/packagegroups/packagegroup-core-basic.bb RDEPENDS_packagegroup-core-multiuser = "\ · line 110

Quoted 13 lines
meta/recipes-extended/packagegroups/packagegroup-core-basic.bb +1 -1
index c73d173..03dabbf 100644
@@ -104,7 +104,7 @@ RDEPENDS_packagegroup-core-multiuser = "\
     cracklib \
     gzip \
     libuser \
-    libpam \
+    ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \
     shadow \
     sudo \
     "

Do we even need to mention libpam in here? If pam is enabled, shadow will have a runtime dependency on it.

Agreed :-)

--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750