Loads of Change!
Richard,
This set of changes is currently being built on the Autobuilder along with some change I dropped for this request. Based on the initial builds, I believe that most of these changes are correct and buildable.
I an attempt to clear the decks and move things forward I am suggesting we take these changes in. I dropped Martin's SDL changes since they are causing some of the Autobuilder failures currently
There still seems to be an issue with connman sanity, and shadow (populate_sysroot_setscene):
ERROR: Task 3037 (/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc/build/meta/recipes-extended/shadow/shadow-sysroot_4.1.4.3.bb, do_populate_sysroot_setscene) failed with exit code '1'
I included many of your patches in this to verify them as part of this build.
Please review the AB failures, to confirm my thoughts above.
Thanks
Sau!
The following changes since commit 25fae81538a92e15eab3fc169ebce44505f67839:
python: skip setup.py 'import check' when cross-compiling (2011-11-08 21:44:23 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/stage2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage2
Bruce Ashfield (1):
linux-yocto: config cleanups + romely rt support
Darren Hart (1):
ncurses: refactor configure to avoid configuring widec when disabled
Joshua Lock (3):
shared-mime-info: package runtime data separately classes/[gnome|gnomebase|mime]: enhance gnome related classes
gconf: add upstream GNOME gconf 3.2.3 and drop gconf-dbus
Martin Jansa (6):
libxml2: use Copyright in LIC_FILES_CHKSUM instead of COPYING
kbd: import from meta-oe
kbd: add RREPLACES/RCONFLICTS/RPROVIDES for upgradeable path from
console-tools
task-core-boot, keymaps: add another VIRTUAL-RUNTIME to allow
distributions to use different set of initscripts or no initscripts at all
keymaps: depend on kbd instead of console-tools
task-core-x11: use VIRTUAL-RUNTIME variables for xserver_common and
graphical_init_manager
Matthew McClintock (1):
Introduce new SERIAL_CONSOLES to add multiple consoles for your
MACHINE
Paul Eggleton (2):
classes/package_rpm: disable uninstall scripts for upgrades
busybox: add grep to temporary links during uninstall
Paul Menzel (2):
libarchive: Remove obsolete comment and empty line at the end
xinit: Fix startx looking for mcookie in sysroot
Richard Purdie (7):
hacktastic patch to fix adduser under rpm
bitbake.conf: Unload pseudo when its not required for a given task scripts/qemuimage-testlib: Output a slightly better error if expect
is missing
classes: Remove various bashisms
Allow use of dash as /bin/sh
qemu: Ensure an internal qemugl script uses bash as it has bashisms
useradd: Add missing DEPEND on shadow
Saul Wold (4):
Distro_tracking: Update Manual Check Date
libtasn1: update to 2.10
lame: update to 3.99.1
udev-extraconf: blacklist /dev/md
Scott Garman (4):
useradd.bbclass: only modify packages in USERADD_PACKAGES useradd.bbclass: do not modify -nativesdk packages useradd-example.bb: update example documentation comments
avahi: remove USERADDPN
Tom Zanussi (1):
python: bump PR
Xiaofeng Yan (1):
local.conf.sample.extended: Fix bug 1674
.../recipes-skeleton/useradd/useradd-example.bb | 9 +-
meta/classes/gnome.bbclass | 18 +-
meta/classes/gnomebase.bbclass | 30 +
meta/classes/image-prelink.bbclass | 2 +-
meta/classes/kernel.bbclass | 2 +-
meta/classes/mime.bbclass | 58 +
meta/classes/package_rpm.bbclass | 39 +-
meta/classes/sanity.bbclass | 3 -
meta/classes/useradd.bbclass | 49 +-
meta/conf/bitbake.conf | 1 +
meta/conf/distro/include/default-providers.inc | 2 -
.../conf/distro/include/distro_tracking_fields.inc | 94 +-
meta/conf/local.conf.sample.extended | 3 +
meta/conf/multilib.conf | 2 +-
meta/recipes-bsp/keymaps/keymaps_1.0.bb | 9 +-
meta/recipes-connectivity/avahi/avahi.inc | 1 -
.../recipes-core/base-passwd/base-passwd_3.5.22.bb | 8 +-
meta/recipes-core/busybox/busybox.inc | 11 +-
meta/recipes-core/busybox/busybox_1.18.5.bb | 2 +-
meta/recipes-core/kbd/kbd_1.15.2.bb | 24 +
meta/recipes-core/libxml/libxml2.inc | 2 +-
meta/recipes-core/libxml/libxml2_2.7.8.bb | 2 +-
meta/recipes-core/ncurses/ncurses.inc | 66 +-
.../sysvinit/sysvinit-inittab_2.88dsf.bb | 10 +
meta/recipes-core/tasks/task-core-boot.bb | 6 +-
meta/recipes-core/udev/files/mount.blacklist | 1 +
meta/recipes-core/udev/udev-extraconf_0.0.bb | 2 +-
meta/recipes-devtools/libtool/libtool/prefix.patch | 11 +-
.../openjade/openjade-native_1.3.2.bb | 4 +-
meta/recipes-devtools/python/python_2.7.2.bb | 2 +-
.../qemu/qemu-0.14.0/qemu-git-qemugl-host.patch | 2 +-
.../qemu/qemu-0.15.0/qemu-git-qemugl-host.patch | 2 +-
.../qemu/qemu-git/qemu-git-qemugl-host.patch | 2 +-
meta/recipes-devtools/qemu/qemu_0.14.0.bb | 2 +-
meta/recipes-devtools/qemu/qemu_0.15.0.bb | 2 +-
meta/recipes-devtools/qemu/qemu_git.bb | 2 +-
meta/recipes-devtools/rpm/psm.c | 3115 ++++++++++++++++++++
meta/recipes-devtools/rpm/rpm/hacktastic.patch | 62 +
meta/recipes-devtools/rpm/rpm_5.4.0.bb | 3 +-
.../libarchive/libarchive_2.8.5.bb | 3 -
meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch | 59 +
meta/recipes-gnome/gnome/gconf-dbus_705.bb | 43 -
meta/recipes-gnome/gnome/gconf_3.2.3.bb | 43 +
meta/recipes-graphics/xorg-app/xinit_1.3.0.bb | 7 +-
meta/recipes-kernel/linux/linux-yocto_3.0.bb | 2 +-
.../lame/{lame-3.98.4 => lame}/no-gtk1.patch | 0
.../lame/{lame_3.98.4.bb => lame_3.99.1.bb} | 6 +-
meta/recipes-sato/tasks/task-core-x11.bb | 10 +-
.../gnutls/{libtasn1_2.9.bb => libtasn1_2.10.bb} | 8 +-
.../shared-mime-info/shared-mime-info.inc | 9 +-
.../shared-mime-info/shared-mime-info_0.91.bb | 2 +-
scripts/qemuimage-testlib | 14 +
52 files changed, 3644 insertions(+), 227 deletions(-)
create mode 100644 meta/classes/gnomebase.bbclass
create mode 100644 meta/classes/mime.bbclass
create mode 100644 meta/recipes-core/kbd/kbd_1.15.2.bb
create mode 100644 meta/recipes-devtools/rpm/psm.c
create mode 100644 meta/recipes-devtools/rpm/rpm/hacktastic.patch
create mode 100644 meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch
delete mode 100644 meta/recipes-gnome/gnome/gconf-dbus_705.bb
create mode 100644 meta/recipes-gnome/gnome/gconf_3.2.3.bb
rename meta/recipes-multimedia/lame/{lame-3.98.4 => lame}/no-gtk1.patch (100%)
rename meta/recipes-multimedia/lame/{lame_3.98.4.bb => lame_3.99.1.bb} (82%)
rename meta/recipes-support/gnutls/{libtasn1_2.9.bb => libtasn1_2.10.bb} (65%)Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 01/33] local.conf.sample.extended: Fix bug 1674
From: Xiaofeng Yan <[email protected]>
[YOCTO #1674]
local.conf.sample.extended: An image based on gtk+-directfb don't need x11 for DEFAULT_FEATURES
Remove "x11" from DEFAULT_FEATURES and add "directfb" to it because someone could don't need x11 in their project, perhaps gtk over directfb will meet his reqirement.
--- meta/conf/local.conf.sample.extended | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
meta/conf/local.conf.sample.extended +3 -0
@@ -15,6 +15,9 @@ #DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci ${DISTRO_FEATURES_LIBC}" +# If you want to get an image based on gtk+directfb without x11, Please copy this variable to build/conf/local.conf +#DISTRO_FEATURES = "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g directfb ${DISTRO_FEATURES_LIBC}" + # ENABLE_BINARY_LOCALE_GENERATION controls the generation of binary locale # packages at build time using qemu-native. Disabling it (by setting it to 0) # will save some build time at the expense of breaking i18n on devices with
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 03/33] Introduce new SERIAL_CONSOLES to add multiple consoles for your MACHINE
In reply to Saul WoldFrom: Matthew McClintock <[email protected]>
Just define additional serial consoles like so:
SERIAL_CONSOLES="115200;ttyS0 115200;ttyS1 ... 115200;ttySN"
Also be sure to remove SERIAL_CONSOLE (lacking the S) from your machine as they can conflict.
--- .../sysvinit/sysvinit-inittab_2.88dsf.bb | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-)
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +10 -0
@@ -25,6 +25,16 @@ do_install() { if [ ! -z "${SERIAL_CONSOLE}" ]; then echo "S:2345:respawn:${base_sbindir}/getty ${SERIAL_CONSOLE}" >> ${D}${sysconfdir}/inittab fi + + idx=0 + tmp="${SERIAL_CONSOLES}" + for i in $tmp + do + j=`echo ${i} | sed s/\;/\ /g` + echo "${idx}:2345:respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab + idx=`expr $idx + 1` + done + if [ "${USE_VT}" = "1" ]; then cat <<EOF >>${D}${sysconfdir}/inittab # ${base_sbindir}/getty invocations for the runlevels.
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 02/33] libxml2: use Copyright in LIC_FILES_CHKSUM instead of COPYING
In reply to Saul WoldFrom: Martin Jansa <[email protected]>
* COPYING is replaced by symlink to Copyright during do_configure (see configure.in), then we end with link to nonexistent file
* same issue as libxslt had http://patchwork.openembedded.org/patch/14195/
--- meta/recipes-core/libxml/libxml2.inc | 2 +- meta/recipes-core/libxml/libxml2_2.7.8.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-core/libxml/libxml2.inc +1 -1
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.xmlsoft.org/" BUGTRACKER = "http://bugzilla.gnome.org/buglist.cgi?product=libxml2" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=bb90c48926316d9af6e2d70ca7013ade \ +LIC_FILES_CHKSUM = "file://Copyright;md5=bb90c48926316d9af6e2d70ca7013ade \ file://hash.c;beginline=6;endline=15;md5=ce702952bfddd7aee22639a2d6b54136 \ file://list.c;beginline=4;endline=13;md5=cdbfa3dee51c099edb04e39f762ee907 \ file://trio.c;beginline=5;endline=14;md5=6c025753c86d958722ec76e94cae932e"
meta/recipes-core/libxml/libxml2_2.7.8.bb +1 -1
@@ -1,6 +1,6 @@ require libxml2.inc -PR = "r3" +PR = "r4" SRC_URI[md5sum] = "8127a65e8c3b08856093099b52599c86" SRC_URI[sha256sum] = "cda23bc9ebd26474ca8f3d67e7d1c4a1f1e7106364b690d822e009fdc3c417ec"
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 06/33] libtasn1: update to 2.10
In reply to Saul WoldCOPYING.LIB has white space formating changing
README has Copyright update to year range
---
.../gnutls/{libtasn1_2.9.bb => libtasn1_2.10.bb} | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
rename meta/recipes-support/gnutls/{libtasn1_2.9.bb => libtasn1_2.10.bb} (65%)meta/recipes-support/gnutls/libtasn1_2.10.bb renamed from meta/recipes-support/gnutls/libtasn1_2.9.bb +3 -5
@@ -5,18 +5,16 @@ LICENSE = "GPLv3+ & LGPLv2.1+" LICENSE_${PN}-bin = "GPLv3+" LICENSE_${PN} = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ file://README;endline=8;md5=c3803a3e8ca5ab5eb1e5912faa405351" -#RREPLACES_${PN}-bin = "libtasn1 (<< 2.7)" +SRC_URI[md5sum] = "ef80c227d0dcdc2940fbc58faf8e0cf1" +SRC_URI[sha256sum] = "17e4c06212e00437c13633c26ed73dad21784805008cf7550f1399adbd1006d0" PR = "r0" SRC_URI = "ftp://ftp.gnu.org/gnu/libtasn1/libtasn1-${PV}.tar.gz" -SRC_URI[md5sum] = "f4f4035b84550100ffeb8ad4b261dea9" -SRC_URI[sha256sum] = "fac46855fac8b08cf6f5a1b60cebad8e090bac1f06c335a044e84110d0b412c4" - inherit autotools binconfig lib_package BBCLASSEXTEND = "native"
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 04/33] libarchive: Remove obsolete comment and empty line at the end
In reply to Saul WoldFrom: Paul Menzel <[email protected]>
This is a fix up for
commit fb19df5b21e551c5dfdfa340438952560c5fa528
Author: Xiaofeng Yan <[email protected]>
Date: Mon Nov 7 20:03:53 2011 +0800
libarchive: update to 2.8.5
Remove patch "0003-Patch-from-upstream-rev-2516.patch" because it has been merged to source codes.
removing a now obsolete comment because the undistributable content was removed [1] from upstream’s tarball.
Also remove an empty line at the end introduced in the above commit.
[1] http://code.google.com/p/libarchive/issues/detail?id=162
--- .../libarchive/libarchive_2.8.5.bb | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-)
meta/recipes-extended/libarchive/libarchive_2.8.5.bb +0 -3
@@ -7,8 +7,6 @@ PR = "r0" DEPENDS = "libxml2" -# We need to repack the tarball due undistributable content on the upstream one. -# More details at http://code.google.com/p/libarchive/issues/detail?id=162 SRC_URI = "http://libarchive.googlecode.com/files/libarchive-${PV}.tar.gz \ file://0001-Patch-from-upstream-revision-1990.patch \ file://0002-Patch-from-upstream-revision-1991.patch \
@@ -24,4 +22,3 @@ SRC_URI[sha256sum] = "13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c inherit autotools lib_package BBCLASSEXTEND = "nativesdk" -
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 05/33] Distro_tracking: Update Manual Check Date
In reply to Saul WoldChecked the following Upstreams:
apt
libaio
sysstat
unzip
zip
linexif
boost
libcheck
ncurses
sysfsutils
util-linux - Offline
lsb
eds-tools
libmad
lame
glew
squashfs-tools
--- .../conf/distro/include/distro_tracking_fields.inc | 94 ++++++++++++-------- 1 files changed, 57 insertions(+), 37 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +57 -37
@@ -484,7 +484,7 @@ RECIPE_LATEST_VERSION_pn-ncurses = "5.9" RECIPE_LAST_UPDATE_pn-ncurses = "Apr 06, 2011" RECIPE_INTEL_SECTION_pn-ncurses = "base libs" RECIPE_MAINTAINER_pn-ncurses = "Saul Wold <[email protected]>" -RECIPE_MANUAL_CHECK_DATE_pn-ncurses = "Sep 29, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-ncurses = "Nov 08, 2011" RECIPE_STATUS_pn-popt = "green" RECIPE_LAST_UPDATE_pn-popt = "Jul 5, 2010"
@@ -570,20 +570,22 @@ RECIPE_COMMENTS_pn-tcp-wrappers = "Consider looking at ipv6.4 version" RECIPE_NO_UPDATE_REASON_pn-tcp-wrapers = "7.6 is last Stable release" RECIPE_STATUS_pn-libaio = "green" +RECIPE_LATEST_VERSION_pn-libaio = "0.3.109" +RECIPE_LATEST_RELEASE_DATE_pn-libaio = "Aug 30, 2011" RECIPE_LAST_UPDATE_pn-libaio = "Aug 27, 2010" RECIPE_MAINTAINER_pn-libaio = "Saul Wold <[email protected]>" -RECIPE_LATEST_VERSION_pn-libaio = "0.3.107" -RECIPE_MANUAL_CHECK_DATE_pn-libaio = "Jun 6, 2011" -RECIPE_COMMENTS_pn-libaio = "1.0.9 is current unstable" +RECIPE_MANUAL_CHECK_DATE_pn-libaio = "Nov 8, 2011" +RECIPE_COMMENTS_pn-libaio = "" RECIPE_STATUS_pn-libcheck = "green" RECIPE_DEPENDENCY_CHECK_pn-libcheck = "done" +RECIPE_LATEST_VERSION_pn-libcheck = "0.9.8" +RECIPE_LATEST_RELEASE_DATE_pn-libcheck = "Sep 23, 2009" RECIPE_LAST_UPDATE_pn-libcheck = "Aug 20, 2010" +RECIPE_MANUAL_CHECK_DATE_pn-libcheck = "Nov 8, 2011" RECIPE_MAINTAINER_pn-libcheck = "Saul Wold <[email protected]>" -RECIPE_LATEST_VERSION_pn-libcheck = "0.9.8" RECIPE_INTEL_SECTION_pn-libcheck = "base libs" RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libcheck = "9 months" -RECIPE_LATEST_RELEASE_DATE_pn-libcheck = "Sep 01, 2009" RECIPE_COMMENTS_pn-libcheck = "" DISTRO_PN_ALIAS_pn-libcheck = "Ubuntu=check Fedora=check OpenSuSE=check"
@@ -1171,10 +1173,10 @@ RECIPE_LAST_UPDATE_pn-apr-util = "Jul 28, 2011" RECIPE_MAINTAINER_pn-apr-util = "Zhai Edwin <[email protected]>" RECIPE_STATUS_pn-apt = "red" -RECIPE_LATEST_VERSION_pn-apt = "0.8.15.8" -RECIPE_LATEST_RELEASE_DATE_pn-apt = "Sep 14, 2011" +RECIPE_LATEST_VERSION_pn-apt = "0.8.15.9" +RECIPE_LATEST_RELEASE_DATE_pn-apt = "Oct 14, 2011" RECIPE_LAST_UPDATE_pn-apt = "Oct 6, 2011" -RECIPE_MAINTAINER_pn-apt = "Mei Lei <[email protected]>" +RECIPE_MANUAL_CHECK_DATE_pn-apt = "Nov 08, 2011" RECIPE_NO_UPDATE_REASON_pn-apt="similar to zypper, defer the upgrading" RECIPE_STATUS_pn-chrpath = "red"
@@ -1313,14 +1315,18 @@ RECIPE_LATEST_VERSION_pn-psmisc = "22.13" RECIPE_LAST_UPDATE_pn-psmisc = "Jan 18, 2008" RECIPE_MAINTAINER_pn-psmisc = "Yu Ke <[email protected]>" -RECIPE_STATUS_pn-boost = "red" -RECIPE_LATEST_VERSION_pn-boost = "1.44.0" +RECIPE_STATUS_pn-boost = "yellow" +RECIPE_LATEST_VERSION_pn-boost = "1.47.0" +RECIPE_LATEST_RELEASE_DATE_pn-boost = "Jul 12, 2011" RECIPE_LAST_UPDATE_pn-boost = "Aug 19, 2010" +RECIPE_MANUAL_CHECK_DATE_pn-boost = "Nov 08, 2011" RECIPE_MAINTAINER_pn-boost = "Saul Wold <[email protected]>" -RECIPE_STATUS_pn-boost-jam-native = "red" +RECIPE_STATUS_pn-boost-jam-native = "green" RECIPE_LATEST_VERSION_pn-boost-jam-native = "3.1.18" +RECIPE_LATEST_RELEASE_DATE_pn-boost-jam-native = "Mar 22, 2011" RECIPE_LAST_UPDATE_pn-boost-jam-native = "Aug 19, 2010" +RECIPE_MANUAL_CHECK_DATE_pn-boost-jam-native = "Nov 08, 2011" RECIPE_MAINTAINER_pn-boost-jam-native = "Saul Wold <[email protected]>" RECIPE_STATUS_pn-libfribidi = "red"
@@ -1453,15 +1459,15 @@ RECIPE_LATEST_RELEASE_DATE_pn-sysvinit = "Apr 01, 2010" RECIPE_COMMENTS_pn-sysvinit = "" RECIPE_STATUS_pn-sysfsutils = "green" +RECIPE_LATEST_VERSION_pn-sysfsutils = "2.1.0" +RECIPE_LATEST_RELEASE_DATE_pn-sysfsutils = "Aug 23, 2006" RECIPE_LAST_UPDATE_pn-sysfsutils = "Jun 18, 2010" -RECIPE_MAINTAINER_pn-sysfsutils = "Saul Wold <[email protected]>" RECIPE_DEPENDENCY_CHECK_pn-sysfsutils = "not done" -RECIPE_LATEST_VERSION_pn-sysfsutils = "2.1.0" RECIPE_INTEL_SECTION_pn-sysfsutils = "base utils" RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-sysfsutils = "n/a" -RECIPE_LATEST_RELEASE_DATE_pn-sysfsutils = "Aug 23, 2006" -RECIPE_MANUAL_CHECK_DATE_pn-sysfsutils = "Sep 27, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-sysfsutils = "Nov 08, 2011" RECIPE_COMMENTS_pn-sysfsutils = "" +RECIPE_MAINTAINER_pn-sysfsutils = "Saul Wold <[email protected]>" RECIPE_STATUS_pn-curl = "green" RECIPE_LAST_UPDATE_pn-curl = "Sep 30, 2011"
@@ -1652,25 +1658,25 @@ RECIPE_LATEST_RELEASE_DATE_pn-pcmciautils = "Jan 01, 2010" RECIPE_COMMENTS_pn-pcmciautils = "" RECIPE_STATUS_pn-unzip = "green" +RECIPE_LATEST_VERSION_pn-unzip = "6.0" +RECIPE_LATEST_RELEASE_DATE_pn-unzip = "Apr 25, 2009" RECIPE_LAST_UPDATE_pn-unzip = "Jul 5, 2010" RECIPE_MAINTAINER_pn-unzip = "Saul Wold <[email protected]>" RECIPE_DEPENDENCY_CHECK_pn-unzip = "not done" -RECIPE_LATEST_VERSION_pn-unzip = "6.0" RECIPE_INTEL_SECTION_pn-unzip = "base utils" RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-unzip = "49 months" -RECIPE_LATEST_RELEASE_DATE_pn-unzip = "Apr 01, 2009" -RECIPE_MANUAL_CHECK_DATE_pn-unzip = "Sep 27, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-unzip = "Nov 08, 2011" RECIPE_COMMENTS_pn-unzip = "5.52 has a race condition vulnerability for Unix version" RECIPE_STATUS_pn-zip = "green" +RECIPE_LATEST_VERSION_pn-zip = "3.0" +RECIPE_LATEST_RELEASE_DATE_pn-zip = "Sep 01, 2009" RECIPE_LAST_UPDATE_pn-zip = "Jul 6, 2010" RECIPE_MAINTAINER_pn-zip = "Saul Wold <[email protected]>" RECIPE_DEPENDENCY_CHECK_pn-zip = "not done" -RECIPE_LATEST_VERSION_pn-zip = "3.0" RECIPE_INTEL_SECTION_pn-zip = "base utils" RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-zip = "21 months" -RECIPE_LATEST_RELEASE_DATE_pn-zip = "Sep 01, 2009" -RECIPE_MANUAL_CHECK_DATE_pn-zip = "Sep 27, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-zip = "Nov 08, 2011" RECIPE_COMMENTS_pn-zip = "" RECIPE_STATUS_pn-strace = "green"
@@ -1755,12 +1761,13 @@ RECIPE_INTEL_SECTION_pn-shared-mime-info = "base utils" RECIPE_LATEST_RELEASE_DATE_pn-shared-mime-info = "Feb 01, 2010" RECIPE_STATUS_pn-util-linux = "green" +RECIPE_LATEST_VERSION_pn-util-linux = "2.19.1" RECIPE_LAST_UPDATE_pn-util-linux = "May 24, 2011" +RECIPE_LATEST_RELEASE_DATE_pn-util-linux = "May 2, 2011" RECIPE_MAINTAINER_pn-util-linux = "Saul Wold <[email protected]>" -RECIPE_LATEST_VERSION_pn-util-linux = "2.19.1" RECIPE_INTEL_SECTION_pn-util-linux = "base utils" -RECIPE_LATEST_RELEASE_DATE_pn-util-linux = "May 2, 2011" -RECIPE_MANUAL_CHECK_DATE_pn-util-linux = "Sep 27, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-util-linux = "Nov 08, 2011" +RECIPE_COMMENTS_pn-util-linux = "kernel.org still has this off-line" RECIPE_STATUS_pn-usbutils = "green" RECIPE_LAST_UPDATE_pn-usbutils = "May 20, 2011"
@@ -1808,9 +1815,10 @@ RECIPE_COMMENTS_pn-zypper = "" DISTRO_PN_ALIAS_pn-zypper = "OpenSuse=zypper Meego=zypper" RECIPE_STATUS_pn-sysstat = "green" -RECIPE_LAST_UPDATE_pn-sysstat = "Sep 27, 2011" RECIPE_LATEST_VERSION_pn-sysstat = "10.0.2" -RECIPE_MANUAL_CHECK_DATE_pn-sysstat = "Sep 27, 2011" +RECIPE_LATEST_RELEASE_DATE_pn-systat = "Aug 28, 2011" +RECIPE_LAST_UPDATE_pn-sysstat = "Sep 27, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-systat = "Nov 8, 2011" RECIPE_MAINTAINER_pn-sysstat = "Saul Wold <[email protected]>" RECIPE_STATUS_pn-sysklogd = "red" # need upgrade
@@ -1922,9 +1930,11 @@ RECIPE_LAST_UPDATE_pn-tiff = "Jul 12, 2011" RECIPE_MAINTAINER_pn-tiff = "Saul Wold <[email protected]>" RECIPE_MANUAL_CHECK_DATE_pn-tiff = "Jul 12, 2011" -RECIPE_STATUS_pn-libexif = "red" -RECIPE_LATEST_VERSION_pn-libexif = "0.6.19" -RECIPE_LAST_UPDATE_pn-libexif = "Nov 22, 2010" +RECIPE_STATUS_pn-libexif = "green" +RECIPE_LATEST_VERSION_pn-libexif = "0.6.20" +RECIPE_LATEST_RELEASE_DATE_pn-libexif = "Dec 12, 2010" +RECIPE_LAST_UPDATE_pn-libexif = "Apr 15, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-libexif = "Nov 08, 2011" RECIPE_MAINTAINER_pn-libexif = "Saul Wold <[email protected]>" RECIPE_STATUS_pn-setserial = "red"
@@ -5645,11 +5655,12 @@ RECIPE_STATUS_pn-aaina = "red" DISTRO_PN_ALIAS_pn-aaina = "Intel" RECIPE_STATUS_pn-table = "red" DISTRO_PN_ALIAS_pn-table = "Intel" + RECIPE_STATUS_pn-eds-tools = "red" DISTRO_PN_ALIAS_pn-eds-tools = "OpenedHand" RECIPE_LATEST_VERSION_pn-eds-tools = "bzr" RECIPE_LAST_UPDATE_pn-eds-tools = "Sep 12, 2007" -RECIPE_MANUAL_CHECK_DATE_pn-eds-tools = "Sep 27, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-eds-tools = "Nov 08, 2011" RECIPE_NO_UPDATE_REASON_pn-eds-tools = "Possibly convert to GIT based fetch" RECIPE_STATUS_pn-abiword-embedded = "red"
@@ -5691,24 +5702,34 @@ RECIPE_MAINTAINER_pn-adt-installer = "Jessica Zhang <[email protected]>" RECIPE_LATEST_VERSION_pn-glew = "1.7.0" RECIPE_LATEST_RELEASE_DATE_pn-glew = "Aug 26, 2011" RECIPE_LAST_UPDATE_pn-glew = "May 24, 2011" -RECIPE_MANUAL_CHECK_DATE_pn-glew = "Sep 27, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-glew = "Nov 08, 2011" + +RECIPE_LATEST_VERSION_pn-squashfs-tools = "4.2" +RECIPE_LATEST_RELEASE_DATE_pn-squashfs-tools = "Feb 28, 2011" +RECIPE_LAST_UPDATE_pn-squashfs-tools = "Oct 21, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-squashfs-tools = "Nov 08, 2011" RECIPE_LATEST_VERSION_pn-mpeg2dec = "0.5.1" RECIPE_NO_UPDATE_REASON_pn-mpeg2dec = "Why are we currently at 0.4.1?" RECIPE_MANUAL_CHECK_DATE_pn-mpeg2dec = "May 24, 2011" -RECIPE_LATEST_VERSION_pn-lame = "3.98.4" + +RECIPE_LATEST_VERSION_pn-lame = "3.99" +RECIPE_LATEST_RELEASE_DATE_pn-lame = "Nov 05, 2004 +RECIPE_LAST_UPDATE_pn-lame = "Jul 04, 2006" +RECIPE_MANUAL_CHECK_DATE_pn-lame = "Nov 08, 2011" +DISTRO_PN_ALIAS_pn-lame = "Debian=lame Ubuntu=lame" RECIPE_LATEST_VERSION_pn-libmad = "0.15.1b" -RECIPE_LAST_UPDATE_pn-libmad = "Jul 04, 2006" RECIPE_LATEST_RELEASE_DATE_pn-libmad = "Feb 18, 2004 -RECIPE_MANUAL_CHECK_DATE_pn-libmad = "Sep 27, 2011" +RECIPE_LAST_UPDATE_pn-libmad = "Jul 04, 2006" +RECIPE_MANUAL_CHECK_DATE_pn-libmad = "Nov 08, 2011" RECIPE_LATEST_VERSION_pn-libxml-perl = "0.08" RECIPE_LATEST_VERSION_pn-lsb = "1.4" RECIPE_LAST_UPDATE_pn-lsb = "Nov 04, 2010" RECIPE_LATEST_RELEASE_DATE_pn-lsb = "Jan 04, 2001" -RECIPE_MANUAL_CHECK_DATE_pn-lsb = "Sep 27, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-lsb = "Nov 08, 2011" RECIPE_NO_UPDATE_REASON_pn-lsb = "1.4 is fixed version of LSB Test" RECIPE_LATEST_VERSION_pn-lsbsetup = "0.9"
@@ -5995,7 +6016,6 @@ RECIPE_LATEST_VERSION_pn-chkconfig = "1.3.55" RECIPE_LAST_UPDATE_pn-chkconfig = "Oct 19, 2011" RECIPE_MANUAL_CHECK_DATE_pn-chkconfig = "Oct 25, 2011" -DISTRO_PN_ALIAS_pn-lame = "Debian=lame Ubuntu=lame" DISTRO_PN_ALIAS_pn-libiconv = "Fedora=mingw-libiconv Opensuse=cross-mingw-libiconv" DISTRO_PN_ALIAS_pn-qt4-native = "Fedora=qt4 Debian=qt4-dev-tools" DISTRO_PN_ALIAS_pn-update-alternatives-dpkg = "Opensuse=update-alternatives Mandriva=update-alternatives"
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 09/33] lame: update to 3.99.1
In reply to Saul WoldUpdated lame.h checksum due to change of LGPL Lessor -> Library
---
.../lame/{lame-3.98.4 => lame}/no-gtk1.patch | 0
.../lame/{lame_3.98.4.bb => lame_3.99.1.bb} | 6 +++---
2 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-multimedia/lame/{lame-3.98.4 => lame}/no-gtk1.patch (100%)
rename meta/recipes-multimedia/lame/{lame_3.98.4.bb => lame_3.99.1.bb} (82%)meta/recipes-multimedia/lame/lame/no-gtk1.patch renamed from meta/recipes-multimedia/lame/lame-3.98.4/no-gtk1.patch +0 -0
meta/recipes-multimedia/lame/lame_3.99.1.bb renamed from meta/recipes-multimedia/lame/lame_3.98.4.bb +3 -3
@@ -4,14 +4,14 @@ BUGTRACKER = "http://sourceforge.net/tracker/?group_id=290&atid=100290" SECTION = "console/utils" LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=c46bda00ffbb0ba1dac22f8d087f54d9 \ - file://include/lame.h;beginline=1;endline=20;md5=d3ff8cae3e79c4e9da7169c7928dc3a2" + file://include/lame.h;beginline=1;endline=20;md5=a2258182c593c398d15a48262130a92b PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \ file://no-gtk1.patch" -SRC_URI[md5sum] = "8e9866ad6b570c6c95c8cba48060473f" -SRC_URI[sha256sum] = "ac3144c76617223a9be4aaa3e28a66b51bcab28141050c3af04cb06836f772c8" +SRC_URI[md5sum] = "2576a7368b5c90a87adc9de6b9f0628c" +SRC_URI[sha256sum] = "1eedcbe238f81cdef822f367f104a8ff918062727b61f0c62b24e9f79d941cf0" inherit autotools
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 10/33] kbd: import from meta-oe
In reply to Saul WoldFrom: Martin Jansa <[email protected]>
* replaces console-tools used in keymaps
--- meta/recipes-core/kbd/kbd_1.15.2.bb | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-core/kbd/kbd_1.15.2.bb
meta/recipes-core/kbd/kbd_1.15.2.bb new file +19 -0
@@ -0,0 +1,19 @@ +DESCRIPTION = "This package contains keytable files and keyboard utilities" +# everything minus console-fonts is GPLv2+ +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=587ce626d15bd61699a64a6b8a5afefb" + +inherit autotools gettext + +BBCLASSEXTEND = "native" + +SRC_URI="${KERNELORG_MIRROR}/linux/utils/kbd/kbd-1.15.2.tar.bz2" +SRC_URI[md5sum] = "e850eb91e4d3b94b194efe8e953204c5" +SRC_URI[sha256sum] = "b3602d191eef7a6a8317fc3cd231efa40a89ac235dce57a77cac825a2a21eba6" + +PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans" + +FILES_${PN}-consolefonts = "${datadir}/consolefonts" +FILES_${PN}-consoletrans = "${datadir}/consoletrans" +FILES_${PN}-keymaps = "${datadir}/keymaps" +FILES_${PN}-unimaps = "${datadir}/unimaps"
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 08/33] python: bump PR
In reply to Saul WoldFrom: Tom Zanussi <[email protected]>
Commit 23d2eaf9 ('skip setup.py 'import check' when cross-compiling') neglected bumping the PR, this adds it.
--- meta/recipes-devtools/python/python_2.7.2.bb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-devtools/python/python_2.7.2.bb +1 -1
@@ -1,7 +1,7 @@ require python.inc DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib" DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" DISTRO_SRC_URI ?= "file://sitecustomize.py" DISTRO_SRC_URI_linuxstdbase = ""
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 11/33] kbd: add RREPLACES/RCONFLICTS/RPROVIDES for upgradeable path from console-tools
In reply to Saul WoldFrom: Martin Jansa <[email protected]>
--- meta/recipes-core/kbd/kbd_1.15.2.bb | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
meta/recipes-core/kbd/kbd_1.15.2.bb +5 -0
@@ -6,6 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=587ce626d15bd61699a64a6b8a5afefb" inherit autotools gettext BBCLASSEXTEND = "native" +RREPLACES_${PN} = "console-tools" +RPROVIDES_${PN} = "console-tools" +RCONFLICTS_${PN} = "console-tools" + +PR = "r1" SRC_URI="${KERNELORG_MIRROR}/linux/utils/kbd/kbd-1.15.2.tar.bz2" SRC_URI[md5sum] = "e850eb91e4d3b94b194efe8e953204c5"
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 07/33] ncurses: refactor configure to avoid configuring widec when disabled
In reply to Saul WoldFrom: Darren Hart <[email protected]>
The ENABLE_WIDEC variable can be used to disable ncurses wide character support when your C library doesn't support it. Currently, the do_configure step configures for both narrow and wide characters regardless and only checks ENABLE_WIDEC during compilation. This leads to QA failures with host contamination during configure if the C library doesn't support wide characters.
Refactor do_configure with a new ncurses_configure helper function and only configure for wide character support if ENABLE_WIDEC is true.
Ensure that configure errors are propogated back through to do_configure.
Tested with ENABLE_WIDEC as true and false via an ncurses bbappend on i586, including basic error injection.
V2: INC_PR bump
--- meta/recipes-core/ncurses/ncurses.inc | 66 +++++++++++++++++--------------- 1 files changed, 35 insertions(+), 31 deletions(-)
meta/recipes-core/ncurses/ncurses.inc +35 -31
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc SECTION = "libs" DEPENDS = "ncurses-native" DEPENDS_virtclass-native = "" -INC_PR = "r1" +INC_PR = "r2" inherit autotools binconfig multilib_header
@@ -26,6 +26,36 @@ ENABLE_WIDEC = "true" # builds. BUILD_CPPFLAGS += "-D_GNU_SOURCE" +# Helper function for do_configure to allow multiple configurations +# $1 the directory to run configure in +# $@ the arguments to pass to configure +ncurses_configure() { + mkdir -p $1 + cd $1 + shift + oe_runconf \ + --disable-static \ + --without-debug \ + --without-ada \ + --without-gpm \ + --enable-hard-tabs \ + --enable-xmc-glitch \ + --enable-colorfgbg \ + --with-termpath='${sysconfdir}/termcap:${datadir}/misc/termcap' \ + --with-terminfo-dirs='${sysconfdir}/terminfo:${datadir}/terminfo' \ + --with-shared \ + --disable-big-core \ + --program-prefix= \ + --with-ticlib \ + --with-termlib=tinfo \ + --enable-sigwinch \ + --enable-pc-files \ + --disable-rpath-hack \ + --with-manpage-format=normal \ + "$@" || return 1 + cd .. +} + # Override the function from the autotools class; ncurses requires a # patched autoconf213 to generate the configure script. This autoconf # is not available so that the shipped script will be used.
@@ -35,36 +65,10 @@ do_configure() { # not the case for /dev/null redirections) export cf_cv_working_poll=yes - for i in \ - 'narrowc' \ - 'widec --enable-widec --without-progs'; do - set -- $i - mkdir -p $1 - cd $1 - shift - - oe_runconf \ - --disable-static \ - --without-debug \ - --without-ada \ - --without-gpm \ - --enable-hard-tabs \ - --enable-xmc-glitch \ - --enable-colorfgbg \ - --with-termpath='${sysconfdir}/termcap:${datadir}/misc/termcap' \ - --with-terminfo-dirs='${sysconfdir}/terminfo:${datadir}/terminfo' \ - --with-shared \ - --disable-big-core \ - --program-prefix= \ - --with-ticlib \ - --with-termlib=tinfo \ - --enable-sigwinch \ - --enable-pc-files \ - --disable-rpath-hack \ - --with-manpage-format=normal \ - "$@" - cd .. - done + ncurses_configure "narrowc" || \ + return 1 + ! ${ENABLE_WIDEC} || \ + ncurses_configure "widec" "--enable-widec" "--without-progs" } do_compile() {
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 12/33] task-core-boot, keymaps: add another VIRTUAL-RUNTIME to allow distributions to use different set of initscripts or no initscripts at all
In reply to Saul WoldFrom: Martin Jansa <[email protected]>
--- meta/recipes-bsp/keymaps/keymaps_1.0.bb | 6 +++++- meta/recipes-core/tasks/task-core-boot.bb | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-)
meta/recipes-bsp/keymaps/keymaps_1.0.bb +5 -1
@@ -1,7 +1,11 @@ SUMMARY = "Keyboard maps" DESCRIPTION = "Keymaps and initscript to set the keymap on bootup." SECTION = "base" -RDEPENDS_${PN} = "initscripts console-tools" + +# Distro can override initscripts provider +VIRTUAL-RUNTIME_initscripts ?= "initscripts" + +RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_initscripts} console-tools" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" PACKAGE_ARCH = "${MACHINE_ARCH}"
meta/recipes-core/tasks/task-core-boot.bb +4 -2
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS = "virtual/kernel" ALLOW_EMPTY = "1" -PR = "r8" +PR = "r9" # # Set by the machine configuration with packages essential for device bootup
@@ -23,6 +23,8 @@ VIRTUAL-RUNTIME_dev_manager ?= "udev" VIRTUAL-RUNTIME_login_manager ?= "tinylogin" # Distro can override init_manager provider VIRTUAL-RUNTIME_init_manager ?= "sysvinit" +# Distro can override initscripts provider +VIRTUAL-RUNTIME_initscripts ?= "initscripts" PACKAGES = "\ task-core-boot \
@@ -34,7 +36,7 @@ RDEPENDS_task-core-boot = "\ base-files \ base-passwd \ busybox \ - initscripts \ + ${VIRTUAL-RUNTIME_initscripts} \ ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \ modutils-initscripts \ netbase \
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 13/33] keymaps: depend on kbd instead of console-tools
In reply to Saul WoldFrom: Martin Jansa <[email protected]>
* nowadays kbd seems more active
--- meta/recipes-bsp/keymaps/keymaps_1.0.bb | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
meta/recipes-bsp/keymaps/keymaps_1.0.bb +3 -2
@@ -5,11 +5,12 @@ SECTION = "base" # Distro can override initscripts provider VIRTUAL-RUNTIME_initscripts ?= "initscripts" -RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_initscripts} console-tools" +RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_initscripts} kbd" + LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" PACKAGE_ARCH = "${MACHINE_ARCH}" -PR = "r19" +PR = "r20" INHIBIT_DEFAULT_DEPS = "1"
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 14/33] task-core-x11: use VIRTUAL-RUNTIME variables for xserver_common and graphical_init_manager
In reply to Saul WoldFrom: Martin Jansa <[email protected]>
--- meta/recipes-sato/tasks/task-core-x11.bb | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-)
meta/recipes-sato/tasks/task-core-x11.bb +8 -2
@@ -30,6 +30,12 @@ ALLOW_EMPTY = "1" FILEMANAGER ?= "pcmanfm" FILEMANAGER_mips ?= "" +# xserver-common, x11-common +VIRTUAL-RUNTIME_xserver_common ?= "x11-common" + +# elsa, xserver-nodm-init +VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init" + RDEPENDS_task-core-x11-base = "\ dbus \
@@ -42,8 +48,8 @@ RDEPENDS_task-core-x11-base = "\ matchbox-desktop \ matchbox-session \ ${XSERVER} \ - x11-common \ - xserver-nodm-init \ + ${VIRTUAL-RUNTIME_xserver_common} \ + ${VIRTUAL-RUNTIME_graphical_init_manager} \ liberation-fonts \ xauth \ xhost \
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 16/33] busybox: add grep to temporary links during uninstall
In reply to Saul WoldFrom: Paul Eggleton <[email protected]>
In the busybox package prerm we set up some temporary links and modify PATH so that certain utilities are provided for the purpose of running update-alternatives; if grep is not among these then you get errors when removing busybox, so add a temporary link for grep as well.
Resorted the link list.
--- meta/recipes-core/busybox/busybox.inc | 11 ++++++----- meta/recipes-core/busybox/busybox_1.18.5.bb | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-)
meta/recipes-core/busybox/busybox.inc +6 -5
@@ -259,17 +259,18 @@ pkg_prerm_${PN} () { # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX` ln -s /bin/busybox $tmpdir/[ - ln -s /bin/busybox $tmpdir/test - ln -s /bin/busybox $tmpdir/head - ln -s /bin/busybox $tmpdir/sh ln -s /bin/busybox $tmpdir/basename + ln -s /bin/busybox $tmpdir/dirname ln -s /bin/busybox $tmpdir/echo - ln -s /bin/busybox $tmpdir/mv + ln -s /bin/busybox $tmpdir/grep + ln -s /bin/busybox $tmpdir/head ln -s /bin/busybox $tmpdir/ln - ln -s /bin/busybox $tmpdir/dirname + ln -s /bin/busybox $tmpdir/mv ln -s /bin/busybox $tmpdir/rm ln -s /bin/busybox $tmpdir/sed + ln -s /bin/busybox $tmpdir/sh ln -s /bin/busybox $tmpdir/sort + ln -s /bin/busybox $tmpdir/test export PATH=$PATH:$tmpdir while read link
meta/recipes-core/busybox/busybox_1.18.5.bb +1 -1
@@ -1,5 +1,5 @@ require busybox.inc -PR = "r1" +PR = "r2" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://udhcpscript.patch \
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 18/33] udev-extraconf: blacklist /dev/md
In reply to Saul WoldDo not mount /dev/md by default via udev, this resolved a problem with the sanity test failing due to seeing the error while attempting to mount /dev/md0
--- meta/recipes-core/udev/files/mount.blacklist | 1 + meta/recipes-core/udev/udev-extraconf_0.0.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-)
meta/recipes-core/udev/files/mount.blacklist +1 -0
@@ -1,3 +1,4 @@ /dev/loop /dev/ram /dev/mtdblock +/dev/md
meta/recipes-core/udev/udev-extraconf_0.0.bb +1 -1
@@ -3,7 +3,7 @@ DESCRIPTION = "Extra machine specific configuration files for udev, specifically LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" -PR = "r1" +PR = "r2" SRC_URI = "file://mount.blacklist \ file://COPYING.GPL"
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 17/33] linux-yocto: config cleanups + romely rt support
In reply to Saul WoldFrom: Bruce Ashfield <[email protected]>
Updating the meta branch SRCREV to pickup a series of BSP cleanups and add -rt support to the romely.
ae3e64c meta/romley: Add rt support Add rt support to the meta branch for romley. 6c78969 meta/fishriver: enable hpet
bc4452a meta/jasperforest: use power/intel feature
6e9634e meta/fri2: use power/intel feature
ec949f5 meta/fishriver: use power/intel feature
--- meta/recipes-kernel/linux/linux-yocto_3.0.bb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-kernel/linux/linux-yocto_3.0.bb +1 -1
@@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= "16eb6506148ff163cfc4f4516110275726831014" SRCREV_machine_qemux86 ?= "fea3842615c13a54180b6600783b222f499002ef" SRCREV_machine_qemux86-64 ?= "5f86f8f0a3102e1c7d0164abefcd50d825aa468f" SRCREV_machine ?= "a811486d28dd9b0e1af0672a65ad9fa97873b82a" -SRCREV_meta ?= "4095bb597a7bcd647856aa35b5fb8637ed7ff975" +SRCREV_meta ?= "ae3e64c077972fe87f09946bd215620df68ca327" PR = "r2" PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 15/33] classes/package_rpm: disable uninstall scripts for upgrades
In reply to Saul WoldFrom: Paul Eggleton <[email protected]>
Our current assumption (based on the behaviour of opkg) when writing recipes is that prerm and postrm do not get called during an upgrade. When using rpm however, these are mapped to the rpm "preun" and "postun" events which occur after postinst for upgrades, and when these contain removal type operations (such as update-alternatives --remove) this causes problems.
This patch wraps each preun and postun script for rpm in a check that determines whether or not the script is being called during an upgrade, and skips the entire script if it is, which mimics the behaviour of opkg under the same conditions.
Fixes [YOCTO #1760]
--- meta/classes/package_rpm.bbclass | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-)
meta/classes/package_rpm.bbclass +16 -2
@@ -471,6 +471,16 @@ python write_specfile () { else: target.append(path + "/" + file) + # Prevent the prerm/postrm scripts from being run during an upgrade + def wrap_uninstall(scriptvar): + scr = scriptvar.strip() + if scr.startswith("#!"): + pos = scr.find("\n") + 1 + else: + pos = 0 + scr = scr[:pos] + 'if [ "$1" = "0" ] ; then\n' + scr[pos:] + '\nfi' + return scr + packages = bb.data.getVar('PACKAGES', d, True) if not packages or packages == '': bb.debug(1, "No packages; nothing to do")
@@ -671,8 +681,10 @@ python write_specfile () { spec_scriptlets_bottom.append('%%post -n %s' % splitname) elif script == 'prerm': spec_scriptlets_bottom.append('%%preun -n %s' % splitname) + scriptvar = wrap_uninstall(scriptvar) elif script == 'postrm': spec_scriptlets_bottom.append('%%postun -n %s' % splitname) + scriptvar = wrap_uninstall(scriptvar) spec_scriptlets_bottom.append(scriptvar) spec_scriptlets_bottom.append('')
@@ -758,11 +770,13 @@ python write_specfile () { spec_scriptlets_top.append('') if srcprerm: spec_scriptlets_top.append('%preun') - spec_scriptlets_top.append(srcprerm) + scriptvar = wrap_uninstall(srcprerm) + spec_scriptlets_top.append(scriptvar) spec_scriptlets_top.append('') if srcpostrm: spec_scriptlets_top.append('%postun') - spec_scriptlets_top.append(srcpostrm) + scriptvar = wrap_uninstall(srcpostrm) + spec_scriptlets_top.append(scriptvar) spec_scriptlets_top.append('') # Write the SPEC file
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 20/33] classes/[gnome|gnomebase|mime]: enhance gnome related classes
In reply to Saul WoldFrom: Joshua Lock <[email protected]>
This patch pulls in the gnome related classes from oe-core which adds extra packaging rules and functionality whilst modularising things so that one can get a subset of gnome functionality without adding a lot of extra dependencies.
These aren't an exact copy of the classes from meta-openembedded, notable differences are:
* gnome.bbclass - I dropped the BBCLASSEXTEND
* mime.bbclass:
- updated coding style
- use which to find update-mime-database program rather than hard coded
- fix typo in populate_packges_append such that it's actually called
--- meta/classes/gnome.bbclass | 18 +----------- meta/classes/gnomebase.bbclass | 30 ++++++++++++++++++++ meta/classes/mime.bbclass | 58 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+), 16 deletions(-) create mode 100644 meta/classes/gnomebase.bbclass create mode 100644 meta/classes/mime.bbclass
meta/classes/gnome.bbclass +2 -16
@@ -1,17 +1,3 @@ -def gnome_verdir(v): - import re - m = re.match("^([0-9]+)\.([0-9]+)", v) - return "%s.%s" % (m.group(1), m.group(2)) +inherit gnomebase gtk-icon-cache gconf mime -SECTION ?= "x11/gnome" -SRC_URI = "${GNOME_MIRROR}/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.bz2;name=archive" - -DEPENDS += "gnome-common" - -FILES_${PN} += "${datadir}/application-registry \ - ${datadir}/mime-info \ - ${datadir}/gnome-2.0" - -inherit autotools pkgconfig gconf - -EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1" +EXTRA_OECONF += "--enable-introspection=no"
meta/classes/gnomebase.bbclass new file +30 -0
@@ -0,0 +1,30 @@ +def gnome_verdir(v): + import re + m = re.match("^([0-9]+)\.([0-9]+)", v) + return "%s.%s" % (m.group(1), m.group(2)) + +SECTION ?= "x11/gnome" +SRC_URI = "${GNOME_MIRROR}/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.bz2;name=archive" + +DEPENDS += "gnome-common" + +FILES_${PN} += "${datadir}/application-registry \ + ${datadir}/mime-info \ + ${datadir}/mime/packages \ + ${datadir}/mime/application \ + ${datadir}/gnome-2.0 \ + ${datadir}/polkit* \ + ${datadir}/GConf \ + ${datadir}/glib-2.0/schemas \ +" + +FILES_${PN}-doc += "${datadir}/devhelp" + +inherit autotools pkgconfig + +do_install_append() { + rm -rf ${D}${localstatedir}/lib/scrollkeeper/* + rm -rf ${D}${localstatedir}/scrollkeeper/* + rm -f ${D}${datadir}/applications/*.cache +} +
meta/classes/mime.bbclass new file +58 -0
58 lines not on this page · raw message
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 19/33] shared-mime-info: package runtime data separately
In reply to Saul WoldFrom: Joshua Lock <[email protected]>
The freedesktop.org.xml is required when updating the mime database but otherwise not much use. Therefore package it separately, rather than removing it completely, so that it can be used as required for on-device updates without adding almost 2MB to every image which hase shared-mime-info.
--- .../shared-mime-info/shared-mime-info.inc | 9 ++++++--- .../shared-mime-info/shared-mime-info_0.91.bb | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-)
meta/recipes-support/shared-mime-info/shared-mime-info.inc +6 -3
@@ -17,13 +17,16 @@ EXTRA_OECONF = "--disable-update-mimedb" FILES_${PN} += "${datadir}/mime" FILES_${PN}-dev += "${datadir}/pkgconfig/shared-mime-info.pc" +# freedesktop.org.xml is only required when updating the mime database, +# package it separately +PACKAGES += "shared-mime-info-data" +FILES_shared-mime-info-data = "${datadir}/mime/packages/freedesktop.org.xml" +RDEPENDS_shared-mime-info-data = "shared-mime-info" + do_install () { autotools_do_install update-mime-database ${D}${datadir}/mime - - # we do not need it on device and it is huge - rm ${D}${datadir}/mime/packages/freedesktop.org.xml } do_install_virtclass-native () {
meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb +1 -1
@@ -1,5 +1,5 @@ require shared-mime-info.inc -PR = "r1" +PR = "r2" SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc" SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd"
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 21/33] gconf: add upstream GNOME gconf 3.2.3 and drop gconf-dbus
In reply to Saul WoldFrom: Joshua Lock <[email protected]>
The D-Bus backend has been integrated into upstream GConf so we can switch to upstream and drop gconf-dbus.
I've gone for a release in the 3.2 series as we disable Gtk+, and therefore are not impacted by the gtk+3 changes, and the D-Bus backend was unstable before this release.
--- meta/conf/distro/include/default-providers.inc | 2 - meta/conf/multilib.conf | 2 +- meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch | 59 ++++++++++++++++++++ meta/recipes-gnome/gnome/gconf-dbus_705.bb | 43 -------------- meta/recipes-gnome/gnome/gconf_3.2.3.bb | 43 ++++++++++++++ 5 files changed, 103 insertions(+), 46 deletions(-) create mode 100644 meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch delete mode 100644 meta/recipes-gnome/gnome/gconf-dbus_705.bb create mode 100644 meta/recipes-gnome/gnome/gconf_3.2.3.bb
meta/conf/distro/include/default-providers.inc +0 -2
@@ -21,8 +21,6 @@ VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth" # PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib" PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native" -PREFERRED_PROVIDER_gconf ?= "gconf-dbus" -PREFERRED_PROVIDER_gconf-native ?= "gconf-dbus-native" PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf" PREFERRED_PROVIDER_libgcc ?= "libgcc" PREFERRED_PROVIDER_libgcc-nativesdk ?= "libgcc-nativesdk"
meta/conf/multilib.conf +1 -1
@@ -103,7 +103,7 @@ BBCLASSEXTEND_append_pn-gcc-cross-initial = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-gcc-cross-intermediate = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-gcc-cross = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-gcc-runtime = " ${MULTILIBS}" -BBCLASSEXTEND_append_pn-gconf-dbus = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-gconf = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-gdbm = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-gdb = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-gdk-pixbuf = " ${MULTILIBS}"
meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch new file +59 -0
59 lines not on this page · raw message
meta/recipes-gnome/gnome/gconf-dbus_705.bb deleted +0 -43
43 lines not on this page · raw message
meta/recipes-gnome/gnome/gconf_3.2.3.bb new file +43 -0
43 lines not on this page · raw message
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 22/33] xinit: Fix `startx` looking for `mcookie` in sysroot
In reply to Saul WoldFrom: Paul Menzel <[email protected]>
startx run on a system based on the demo systemd image [1] and opkg-installed packages fails with the following error.
/usr/bin/startx: line 139: /OE/tentacle/build/tmp-angstrom_2010_x/sysroots/x68_64-linux/usr/bin/mcookie: No such file or directory
Applying commit 443bcc07 [1] from OE-classic
Author: Tom Rini <[email protected]>
Date: Thu Apr 7 10:36:43 2011 -0700
xinit: Fix mcookie / util-linux-ng dependency
xinit just needs to know the runtime path of mcookie so we need to RDEPEND on util-linux-ng and pass the runtime path in via EXTRA_OECONF
fixes this issue. Commit 7f6cec6f [2]
Author: Frans Meulenbroeks <[email protected]>
Date: Sun Feb 21 18:11:30 2010 +0100
xinit: add dependency on util-linux-ng
[…]
tried to address the same problem but apparently did not help, because Tom still had problems.
[1] http://www.angstrom-distribution.org/demo/beagleboard/Angstrom-systemd-image-eglibc-ipk-v2011.11-core-beagleboard.rootfs.tar.bz2
[2] http://git.openembedded.org/openembedded/commit/443bcc0785bc004e471b3750a34d12d2fd2e5dad
[3] http://git.openembedded.org/openembedded/commit/7f6cec6f0adb6203a6dbaf8a43c67c2c4f8bf84e
--- meta/recipes-graphics/xorg-app/xinit_1.3.0.bb | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
meta/recipes-graphics/xorg-app/xinit_1.3.0.bb +6 -1
@@ -9,9 +9,14 @@ systems. When this first client exits, xinit will kill the X server and \ then terminate." LIC_FILES_CHKSUM = "file://COPYING;md5=0d4b5eef75f1584ccbdc5e4a34314407" -PR = "r0" + +PR = "r1" PE = "1" +EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie" + +RDEPENDS_${PN} += "util-linux" + FILES_${PN} += "${libdir}X11/xinit" SRC_URI[md5sum] = "bc4e8b7d1919597cc37a0d24aa149dda"
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 23/33] useradd.bbclass: only modify packages in USERADD_PACKAGES
In reply to Saul WoldFrom: Scott Garman <[email protected]>
Previously we injected the user/group preinstall script into all output packages. This fixes that so that only packages listed in USERADD_PACKAGES get modified.
It also removes the USERADDPN variable, which is no longer needed.
--- meta/classes/useradd.bbclass | 42 ++++++++++++++++-------------------------- 1 files changed, 16 insertions(+), 26 deletions(-)
meta/classes/useradd.bbclass +16 -26
@@ -1,5 +1,3 @@ -USERADDPN ?= "${PN}" - # base-passwd-cross provides the default passwd and group files in the # target sysroot, and shadow -native and -sysroot provide the utilities # and support files needed to add and modify user and group accounts
@@ -106,30 +104,29 @@ SYSROOTPOSTFUNC_virtclass-nativesdk = "" # Recipe parse-time sanity checks def update_useradd_after_parse(d): - if not d.getVar('USERADD_PACKAGES', False): - if not d.getVar('USERADD_PARAM', False) and not d.getVar('GROUPADD_PARAM', False): - raise bb.build.FuncFailed, "%s inherits useradd but doesn't set USERADD_PARAM or GROUPADD_PARAM" % bb.data.getVar('FILE', d) + useradd_packages = d.getVar('USERADD_PACKAGES', True) + + if not useradd_packages: + raise bb.build.FuncFailed, "%s inherits useradd but doesn't set USERADD_PACKAGES" % bb.data.getVar('FILE', d) + + for pkg in useradd_packages.split(): + if not d.getVar('USERADD_PARAM_%s' % pkg, True) and not d.getVar('GROUPADD_PARAM_%s' % pkg, True): + raise bb.build.FuncFailed, "%s inherits useradd but doesn't set USERADD_PARAM or GROUPADD_PARAM for package %s" % (bb.data.getVar('FILE', d), pkg) python __anonymous() { update_useradd_after_parse(d) } # Return a single [GROUP|USER]ADD_PARAM formatted string which includes the -# [group|user]add parameters for all packages in this recipe +# [group|user]add parameters for all USERADD_PACKAGES in this recipe def get_all_cmd_params(d, cmd_type): import string param_type = cmd_type.upper() + "ADD_PARAM_%s" params = [] - pkgs = d.getVar('USERADD_PACKAGES', True) - if not pkgs: - pkgs = d.getVar('USERADDPN', True) - packages = (d.getVar('PACKAGES', True) or "").split() - if packages and pkgs not in packages: - pkgs = packages[0] - - for pkg in pkgs.split(): + useradd_packages = d.getVar('USERADD_PACKAGES', True) or "" + for pkg in useradd_packages.split(): param = d.getVar(param_type % pkg, True) if param: params.append(param)
@@ -156,17 +153,10 @@ fakeroot python populate_packages_prepend () { rdepends = d.getVar("RDEPENDS_%s" % pkg, True) or "" rdepends += " base-passwd shadow" bb.data.setVar("RDEPENDS_%s" % pkg, rdepends, d) - - # We add the user/group calls to all packages to allow any package - # to contain files owned by the users/groups defined in the recipe. - # The user/group addition code is careful not to create duplicate - # entries, so this is safe. - pkgs = d.getVar('USERADD_PACKAGES', True) - if not pkgs: - pkgs = d.getVar('USERADDPN', True) - packages = (d.getVar('PACKAGES', True) or "").split() - if packages and pkgs not in packages: - pkgs = packages[0] - for pkg in pkgs.split(): + + # Add the user/group preinstall scripts and RDEPENDS requirements + # to packages specified by USERADD_PACKAGES + useradd_packages = d.getVar('USERADD_PACKAGES', True) or "" + for pkg in useradd_packages.split(): update_useradd_package(pkg) }
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 25/33] useradd-example.bb: update example documentation comments
In reply to Saul WoldFrom: Scott Garman <[email protected]>
Clarify that only packages listed in USERADD_PACKAGES will include the user/group creation code.
--- .../recipes-skeleton/useradd/useradd-example.bb | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)
meta-skeleton/recipes-skeleton/useradd/useradd-example.bb +4 -5
@@ -17,13 +17,12 @@ PACKAGES =+ "${PN}-user3" inherit useradd -# Specify which package(s) should include the user/group code. -# Make sure that any packages which install files owned by custom -# users/groups are included here. The code which adds users and -# groups is idempotent. +# You must set USERADD_PACKAGES when you inherit useradd. This +# lists which output packages will include the user/group +# creation code. USERADD_PACKAGES = "${PN} ${PN}-user3" -# You *must* set USERADD_PARAM and/or GROUPADD_PARAM when +# You must also set USERADD_PARAM and/or GROUPADD_PARAM when # you inherit useradd. # USERADD_PARAM specifies command line options to pass to the
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 24/33] useradd.bbclass: do not modify -nativesdk packages
In reply to Saul WoldFrom: Scott Garman <[email protected]>
Exclude the addition of user/group code and RDEPENDS changes for -nativesdk packages.
--- meta/classes/useradd.bbclass | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)
meta/classes/useradd.bbclass +5 -4
@@ -153,10 +153,11 @@ fakeroot python populate_packages_prepend () { rdepends = d.getVar("RDEPENDS_%s" % pkg, True) or "" rdepends += " base-passwd shadow" bb.data.setVar("RDEPENDS_%s" % pkg, rdepends, d) - + # Add the user/group preinstall scripts and RDEPENDS requirements # to packages specified by USERADD_PACKAGES - useradd_packages = d.getVar('USERADD_PACKAGES', True) or "" - for pkg in useradd_packages.split(): - update_useradd_package(pkg) + if not bb.data.inherits_class('nativesdk', d): + useradd_packages = d.getVar('USERADD_PACKAGES', True) or "" + for pkg in useradd_packages.split(): + update_useradd_package(pkg) }
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 26/33] avahi: remove USERADDPN
In reply to Saul WoldFrom: Scott Garman <[email protected]>
USERADDPN is no longer used; remove it.
--- meta/recipes-connectivity/avahi/avahi.inc | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
meta/recipes-connectivity/avahi/avahi.inc +0 -1
@@ -23,7 +23,6 @@ SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ file://99avahi-autoipd \ file://initscript.patch" -USERADDPN = "avahi-daemon" USERADD_PACKAGES = "avahi-daemon" USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \ --no-create-home --shell /bin/false \
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 28/33] bitbake.conf: Unload pseudo when its not required for a given task
In reply to Saul WoldFrom: Richard Purdie <[email protected]>
This yields a small performance boost due to the lack of the preload overhead on each task execution.
--- meta/conf/bitbake.conf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
meta/conf/bitbake.conf +1 -0
@@ -586,6 +586,7 @@ export PSEUDO_DISABLED = "1" #export PSEUDO_BINDIR = "${STAGING_DIR_NATIVE}${bindir_native}" #export PSEUDO_LIBDIR = "${STAGING_DIR_NATIVE}$PSEUDOBINDIR/../lib/pseudo/lib FAKEROOTENV = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_PASSWD=${STAGING_DIR_TARGET} PSEUDO_NOSYMLINKEXP=1 PSEUDO_DISABLED=0" +FAKEROOTNOENV = "PSEUDO_UNLOAD=1" FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}" PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native"
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 29/33] scripts/qemuimage-testlib: Output a slightly better error if expect is missing
In reply to Saul WoldFrom: Richard Purdie <[email protected]>
--- scripts/qemuimage-testlib | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-)
scripts/qemuimage-testlib +14 -0
@@ -96,6 +96,13 @@ expect { eof { exit [ lindex [wait] 3 ] } } EOF` + + expect=`which expect` + if [ ! -x "$expect" ]; then + Test_Error "ERROR: Please install expect" + return 1 + fi + expect -c "$exp_cmd" ret=$? rm -rf $tmpfile
@@ -120,6 +127,13 @@ expect { eof { exit [ lindex [wait] 3 ] } } EOF` + + expect=`which expect` + if [ ! -x "$expect" ]; then + Test_Error "ERROR: Please install expect" + return 1 + fi + expect -c "$exp_cmd" ret=$? rm -rf $tmpfile
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 27/33] hacktastic patch to fix adduser under rpm
In reply to Saul WoldFrom: Richard Purdie <[email protected]>
--- meta/classes/package_rpm.bbclass | 3 +- meta/classes/useradd.bbclass | 2 + .../recipes-core/base-passwd/base-passwd_3.5.22.bb | 8 +- meta/recipes-devtools/rpm/psm.c | 3115 ++++++++++++++++++++ meta/recipes-devtools/rpm/rpm/hacktastic.patch | 62 + meta/recipes-devtools/rpm/rpm_5.4.0.bb | 3 +- 6 files changed, 3187 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-devtools/rpm/psm.c create mode 100644 meta/recipes-devtools/rpm/rpm/hacktastic.patch
meta/classes/package_rpm.bbclass +2 -1
@@ -389,7 +389,8 @@ package_install_internal_rpm () { -D "_dbpath ${rpmlibdir}" \ --noscripts --notriggers --noparentdirs --nolinktos --replacepkgs \ -D "__dbi_txn create nofsync private" \ - -Uhv ${target_rootfs}/install/total_solution.manifest + -Uhv ${target_rootfs}/install/total_solution.manifest \ + --pre } python write_specfile () {
meta/classes/useradd.bbclass +2 -0
@@ -17,6 +17,8 @@ if test "x$D" != "x"; then SYSROOT="$D" OPT="--root $D" + PATH=${STAGING_BINDIR_NATIVE}/../sbin:$PATH + # Add groups and users defined for all recipe packages GROUPADD_PARAM="${@get_all_cmd_params(d, 'group')}" USERADD_PARAM="${@get_all_cmd_params(d, 'user')}"
meta/recipes-core/base-passwd/base-passwd_3.5.22.bb +4 -4
@@ -43,12 +43,12 @@ pkg_preinst_${PN} () { # Used for rootfs generation. On in-target install this will be run # before the unpack so the files won't be available - if [ ! -e $D${sysconfdir}/passwd ] && [ -e $D${datadir}/base-passwd/passwd.master ]; then - cp $D${datadir}/base-passwd/passwd.master $D${sysconfdir}/passwd + if [ ! -e $D${sysconfdir}/passwd ] && [ -e ${STAGING_DIR_TARGET}${datadir}/base-passwd/passwd.master ]; then + cp ${STAGING_DIR_TARGET}${datadir}/base-passwd/passwd.master $D${sysconfdir}/passwd fi - if [ ! -e $D${sysconfdir}/group ] && [ -e $D${datadir}/base-passwd/group.master ]; then - cp $D${datadir}/base-passwd/group.master $D${sysconfdir}/group + if [ ! -e $D${sysconfdir}/group ] && [ -e ${STAGING_DIR_TARGET}${datadir}/base-passwd/group.master ]; then + cp ${STAGING_DIR_TARGET}${datadir}/base-passwd/group.master $D${sysconfdir}/group fi exit 0
meta/recipes-devtools/rpm/psm.c new file +3115 -0
2,967 lines not on this page · raw message
meta/recipes-devtools/rpm/rpm/hacktastic.patch new file +62 -0
62 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.6.4
Part of the diff is not shown here. View the raw message.
[CONSOLIDATED PULL (v2) 31/33] Allow use of dash as /bin/sh
In reply to Saul WoldFrom: Richard Purdie <[email protected]>
We've had the check for dash as /bin/sh for a long time. Dash has been around long enough now that most major issues have been identified and fixed from build perspective.
This patch fixes a bashism in the openjade-native recipe. It also adjusts libtool so that the header at the script is used and not the value of $SHELL. This is because many Makefiles change $SHELL so dash can get used to execute what is otherwise configured as a bash shell script. Since we don't need to execute scripts this way on any system I'm aware of us building upon, the simplest fix is just to remove $SHELL.
With these two changes the dash check can be removed and we can allow builds with dash as /bin/sh
[Note: I know I need to add the description of the libtool change above into the prefix.patch]
--- meta/classes/sanity.bbclass | 3 --- meta/recipes-devtools/libtool/libtool/prefix.patch | 11 ++++++++++- .../openjade/openjade-native_1.3.2.bb | 4 +++- 3 files changed, 13 insertions(+), 5 deletions(-)
meta/classes/sanity.bbclass +0 -3
@@ -331,9 +331,6 @@ def check_sanity(e): if not data.getVar( 'DISPLAY', e.data, True ) and data.getVar( 'IMAGETEST', e.data, True ) == 'qemu': messages = messages + 'qemuimagetest needs a X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n' - if os.path.basename(os.readlink('/bin/sh')) == 'dash': - messages = messages + "Using dash as /bin/sh causes various subtle build problems, please use bash instead (e.g. 'dpkg-reconfigure dash' on an Ubuntu system.\n" - omask = os.umask(022) if omask & 0755: messages = messages + "Please use a umask which allows a+rx and u+rwx\n"
meta/recipes-devtools/libtool/libtool/prefix.patch +10 -1
@@ -8,6 +8,15 @@ Originally by: RP Updated: Date: 2010/06/28 Nitin A Kamble <[email protected]> +It also adjusts libtool so that the header at the script is used for +script execution and not thevalue of $SHELL. This is because many +Makefiles change $SHELL so dash can get used to execute what is +otherwise configured as a bash shell script. Since we don't need to +execute scipts this way on any system I'm aware of us building upon, +the simplest fix is just to remove $SHELL. + +Updated: Date: 2011/11/09 +RP Index: libtool-2.4/libltdl/m4/libtool.m4 ===================================================================
@@ -18,7 +27,7 @@ Index: libtool-2.4/libltdl/m4/libtool.m4 # Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' ++LIBTOOL='$(top_builddir)' +LIBTOOL="$LIBTOOL/${host_alias}-libtool" AC_SUBST(LIBTOOL)dnl
meta/recipes-devtools/openjade/openjade-native_1.3.2.bb +3 -1
@@ -53,7 +53,9 @@ do_install() { install -d ${D}${datadir}/sgml/openjade-${PV} install -m 644 dsssl/catalog ${D}${datadir}/sgml/openjade-${PV} - install -m 644 dsssl/*.{dtd,dsl,sgm} ${D}${datadir}/sgml/openjade-${PV} + install -m 644 dsssl/*.dtd ${D}${datadir}/sgml/openjade-${PV} + install -m 644 dsssl/*.dsl ${D}${datadir}/sgml/openjade-${PV} + install -m 644 dsssl/*.sgm ${D}${datadir}/sgml/openjade-${PV} install -d ${datadir}/sgml/openjade-${PV} install -m 644 dsssl/catalog ${datadir}/sgml/openjade-${PV}/catalog
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 32/33] qemu: Ensure an internal qemugl script uses bash as it has bashisms
In reply to Saul WoldFrom: Richard Purdie <[email protected]>
--- .../qemu/qemu-0.14.0/qemu-git-qemugl-host.patch | 2 +- .../qemu/qemu-0.15.0/qemu-git-qemugl-host.patch | 2 +- .../qemu/qemu-git/qemu-git-qemugl-host.patch | 2 +- meta/recipes-devtools/qemu/qemu_0.14.0.bb | 2 +- meta/recipes-devtools/qemu/qemu_0.15.0.bb | 2 +- meta/recipes-devtools/qemu/qemu_git.bb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)
meta/recipes-devtools/qemu/qemu-0.14.0/qemu-git-qemugl-host.patch +1 -1
@@ -280,7 +280,7 @@ Index: qemu-0.14.0/target-i386/beginend_funcs.sh --- /dev/null +++ qemu-0.14.0/target-i386/beginend_funcs.sh @@ -0,0 +1,23 @@ -+#! /bin/sh ++#! /bin/bash +# Copyright 2008 (C) Intel Corporation +# +# echo names of functions that are legal between a glBegin and glEnd pair.
meta/recipes-devtools/qemu/qemu-0.15.0/qemu-git-qemugl-host.patch +1 -1
@@ -280,7 +280,7 @@ Index: qemu-0.14.0/target-i386/beginend_funcs.sh --- /dev/null +++ qemu-0.14.0/target-i386/beginend_funcs.sh @@ -0,0 +1,23 @@ -+#! /bin/sh ++#! /bin/bash +# Copyright 2008 (C) Intel Corporation +# +# echo names of functions that are legal between a glBegin and glEnd pair.
meta/recipes-devtools/qemu/qemu-git/qemu-git-qemugl-host.patch +1 -1
@@ -280,7 +280,7 @@ Index: qemu-0.14.0/target-i386/beginend_funcs.sh --- /dev/null +++ qemu-0.14.0/target-i386/beginend_funcs.sh @@ -0,0 +1,23 @@ -+#! /bin/sh ++#! /bin/bash +# Copyright 2008 (C) Intel Corporation +# +# echo names of functions that are legal between a glBegin and glEnd pair.
meta/recipes-devtools/qemu/qemu_0.14.0.bb +1 -1
@@ -3,7 +3,7 @@ require qemu.inc LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" -PR = "r3" +PR = "r4" FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" FILESDIR = "${WORKDIR}"
meta/recipes-devtools/qemu/qemu_0.15.0.bb +1 -1
@@ -3,7 +3,7 @@ require qemu.inc LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" -PR = "r0" +PR = "r1" FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" FILESDIR = "${WORKDIR}"
meta/recipes-devtools/qemu/qemu_git.bb +1 -1
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" PV = "0.14.0" -PR = "r1" +PR = "r2" FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/" FILESDIR = "${WORKDIR}"
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 30/33] classes: Remove various bashisms
In reply to Saul WoldFrom: Richard Purdie <[email protected]>
--- meta/classes/image-prelink.bbclass | 2 +- meta/classes/kernel.bbclass | 2 +- meta/classes/package_rpm.bbclass | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-)
meta/classes/image-prelink.bbclass +1 -1
@@ -24,7 +24,7 @@ prelink_image () { ${STAGING_DIR_NATIVE}${sbindir_native}/prelink --root ${IMAGE_ROOTFS} -amR -N -c ${sysconfdir}/prelink.conf # Remove the prelink.conf if we had to add it. - if [ "$dummy_prelink_conf" == "true" ]; then + if [ "$dummy_prelink_conf" = "true" ]; then rm -f ${IMAGE_ROOTFS}${sysconfdir}/prelink.conf fi
meta/classes/kernel.bbclass +1 -1
@@ -152,7 +152,7 @@ kernel_do_install() { # cp -fR * $kerneldir cp .config $kerneldir - if [ ! "${S}" == "${B}" ]; then + if [ "${S}" != "${B}" ]; then cp -fR ${S}/* $kerneldir fi install -m 0644 ${KERNEL_OUTPUT} $kerneldir/${KERNEL_IMAGETYPE}
meta/classes/package_rpm.bbclass +9 -9
@@ -87,22 +87,22 @@ package_generate_rpm_conf_common() { shift printf "_solve_dbpath " > ${rpmconf_base}.macro - o_colon=false + o_colon="false" for archvar in "$@"; do printf "_solve_dbpath " > ${rpmconf_base}-${archvar}.macro - colon=false + colon="false" for each in `cat ${rpmconf_base}-${archvar}.conf` ; do - if [ "$o_colon" == true ]; then + if [ "$o_colon" = "true" ]; then printf ":" >> ${rpmconf_base}.macro fi - if [ "$colon" == true ]; then + if [ "$colon" = "true" ]; then printf ":" >> ${rpmconf_base}-${archvar}.macro fi printf "%s" $each >> ${rpmconf_base}.macro - o_colon=true + o_colon="true" printf "%s" $each >> ${rpmconf_base}-${archvar}.macro - colon=true + colon="true" done printf "\n" >> ${rpmconf_base}-${archvar}.macro done
@@ -214,7 +214,7 @@ package_install_internal_rpm () { ml_prefix=`echo ${pkg} | cut -d'-' -f1` ml_pkg=$pkg for i in ${MULTILIB_PREFIX_LIST} ; do - if [ ${ml_prefix} == ${i} ]; then + if [ ${ml_prefix} = ${i} ]; then ml_pkg=$(echo ${pkg} | sed "s,^${ml_prefix}-\(.*\),\1,") archvar=ml_archs manifest=install_multilib.manifest
@@ -240,7 +240,7 @@ package_install_internal_rpm () { ml_prefix=`echo ${pkg} | cut -d'-' -f1` ml_pkg=$pkg for i in ${MULTILIB_PREFIX_LIST} ; do - if [ ${ml_prefix} == ${i} ]; then + if [ ${ml_prefix} = ${i} ]; then ml_pkg=$(echo ${pkg} | sed "s,^${ml_prefix}-\(.*\),\1,") archvar=ml_archs manifest=install_multilib.manifest
@@ -276,7 +276,7 @@ package_install_internal_rpm () { ml_prefix=`echo ${pkg} | cut -d'-' -f1` ml_pkg=$pkg for i in ${MULTILIB_PREFIX_LIST} ; do - if [ ${ml_prefix} == ${i} ]; then + if [ ${ml_prefix} = ${i} ]; then ml_pkg=$(echo ${pkg} | sed "s,^${ml_prefix}-\(.*\),\1,") archvar=ml_archs break
Signature · 1 line
1.7.6.4
[CONSOLIDATED PULL (v2) 33/33] useradd: Add missing DEPEND on shadow
In reply to Saul WoldFrom: Richard Purdie <[email protected]>
Without this rootfs generation fails as an RDEPENDS is added but the package might not have bneen built.
--- meta/classes/useradd.bbclass | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
meta/classes/useradd.bbclass +1 -1
@@ -2,7 +2,7 @@ # target sysroot, and shadow -native and -sysroot provide the utilities # and support files needed to add and modify user and group accounts DEPENDS_append = "${USERADDDEPENDS}" -USERADDDEPENDS = " base-passwd shadow-native shadow-sysroot" +USERADDDEPENDS = " base-passwd shadow-native shadow-sysroot shadow" USERADDDEPENDS_virtclass-nativesdk = "" # This preinstall function will be run in two contexts: once for the
Signature · 1 line
1.7.6.4
Quoted 11 lines · Saul Wold
Richard,
This set of changes is currently being built on the Autobuilder along with some change I dropped for this request. Based on the initial builds, I believe that most of these changes are correct and buildable.
I an attempt to clear the decks and move things forward I am suggesting we take these changes in. I dropped Martin's SDL changes since they are causing some of the Autobuilder failures currently
Quoted 7 lines
There still seems to be an issue with connman sanity, and shadow (
populate_sysroot_setscene):ERROR: Task 3037 (
/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc/build/meta/recipes-extended/shadow/shadow-sysroot_4.1.4.3.bb,do_populate_sysroot_setscene) failed with exit code '1'I included many of your patches in this to verify them as part of this build.
We still need some patches Mark is working on to resolve the connman regression. I've not taken my "hacktastic" patch since its incomplete and Mark's version will be better. I think most other things are now in.
I did not take the link reordering alphabetically patch since I didn't see that until I'd taken the version queued in master-next. If anyone wants to submit a followup that would be fine. I can't say its a big issue whether its sorted or not though (and it does make sense to separate out a function change from a cosmetic one IMO).
Cheers,
Richard