Various Fixes, Updates
Richard,
Latest batch of requests, built. There's a perl-native patch and a change to make udev an overridable item that might need more thought.
Sau!
The following changes since commit 2e83e6755441cb14bd907d306974338c15173189:
kernel: restore crtsavres.o to enable building external modules on powerpc (2011-08-17 15:46:16 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/stage
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
Adrian Alonso (1):
file: new file version 5.07
Anders Darander (3):
qt4: allow a reduction in build time
qemu: modify search paths for libgl
scripts/runqemu: modify search paths for libgl
Dongxiao Xu (7):
busybox: Change ${PN} to ${BPN} in file names
sysvinit: Change ${PN} to ${BPN} in file names
curl: Use BPN instead of PN for style like lib${PN}
ea-acl: Use BPN instead of PN for style like lib${PN}
attr: Use BPN instead of PN for style like lib${PN}
acl: Use BPN instead of PN for style like lib${PN}
procps: Fix lib path to support multilib
Jingdong Lu (1):
initrdscripts: fix init-live.sh
Joshua Lock (1):
glib-2.0: explicitly disable dtrace and systemtap for native varaint
Kang Kai (6):
at: make at usable for common user
eglibc: check dependencies among eglibc options
mailx: update license and distro tracking fileds
slang: add homepage and update distro tracking fields
alsa-tools: update license and add distro tracking fields
newt: update distro tracking fields
Khem Raj (4):
conf,recipes: Redefine LINKER_HASH_STYLE
gcc-4.6: Use --with-linker-hash-style configure option
task-core-tools: Use LTTNGUST variable instead of hardcoding
lttng-ust
gdb: Add lttng-ust to DEPENDS only for eglibc
Koen Kooi (1):
tcl: fix networking breakage
Martin Jansa (2):
task-core-boot: allow distribution to override default dev_manager
provider with VIRTUAL-RUNTIME_dev_manager
bluez4: update recipe from meta-oe
Noor Ahsan (1):
mtd-utils: Added recipe of newer version 1.4.4.
Paul Eggleton (2):
image.bbclass, kernel.bbclass: create warning file about deleting
deploydir files
sanity.bbclass: add optional untested host distro warning
Phil Blundell (2):
libxkbcommon: new
libxslt: fix packaging of static libraries
Wenzong Fan (1):
perl-native: Update find_perl to find the perl wrapper
meta/classes/image.bbclass | 2 +
meta/classes/kernel.bbclass | 2 +
meta/classes/sanity.bbclass | 48 +++++++++++++
meta/conf/bitbake.conf | 4 +-
meta/conf/distro/include/default-distrovars.inc | 2 +-
.../conf/distro/include/distro_tracking_fields.inc | 29 +++++---
meta/conf/distro/include/tcmode-default.inc | 6 ++-
meta/files/deploydir_readme.txt | 8 ++
meta/recipes-connectivity/bluez/bluez4_4.96.bb | 17 ++---
meta/recipes-core/busybox/busybox.inc | 30 ++++----
meta/recipes-core/busybox/busybox_1.18.4.bb | 2 +-
meta/recipes-core/eglibc/eglibc-options.inc | 75 +++++++++++++++++++-
meta/recipes-core/glib-2.0/glib.inc | 2 +-
meta/recipes-core/initrdscripts/files/init-live.sh | 2 +-
.../initrdscripts/initramfs-live-boot_1.0.bb | 2 +-
meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 52 +++++++-------
meta/recipes-core/tasks/task-core-boot.bb | 5 +-
meta/recipes-core/tasks/task-core-tools.bb | 6 +-
meta/recipes-core/uclibc/uclibc.inc | 2 +-
meta/recipes-devtools/file/file/ge-le.patch | 72 -------------------
.../file/file/stringb-compat.patch | 31 --------
.../file/{file_5.04.bb => file_5.07.bb} | 9 +--
meta/recipes-devtools/gcc/gcc-4.6.inc | 3 +-
meta/recipes-devtools/gdb/gdb-common.inc | 11 +++-
.../add-exclusion-to-mkfs-jffs2-git-2.patch | 0
.../mtd/{mtd-utils_1.4.1.bb => mtd-utils_1.4.4.bb} | 11 ++--
.../perl/perl-5.12.3/MM_Unix.pm.patch | 22 ++++++
meta/recipes-devtools/perl/perl-native_5.12.3.bb | 5 +-
meta/recipes-devtools/qemu/qemu.inc | 2 +-
meta/recipes-devtools/tcltk/tcl_8.5.9.bb | 6 +-
meta/recipes-extended/at/at_3.1.12.bb | 26 ++------
meta/recipes-extended/mailx/mailx_12.5.bb | 4 +-
.../procps/procps-3.2.8/install.patch | 29 --------
meta/recipes-extended/procps/procps.inc | 3 +-
meta/recipes-extended/procps/procps_3.2.8.bb | 8 +-
meta/recipes-extended/slang/slang_2.2.4.bb | 3 +-
.../xorg-lib/libxkbcommon/cross.patch | 43 +++++++++++
meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb | 22 ++++++
.../recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb | 11 ++-
meta/recipes-qt/qt4/qt4.inc | 13 ++--
meta/recipes-support/attr/acl.inc | 2 +-
meta/recipes-support/attr/attr.inc | 2 +-
meta/recipes-support/attr/ea-acl.inc | 6 +-
meta/recipes-support/curl/curl_7.21.7.bb | 8 +-
meta/recipes-support/libxslt/libxslt_1.1.26.bb | 15 ++--
scripts/runqemu | 2 +-
46 files changed, 380 insertions(+), 285 deletions(-)
create mode 100644 meta/files/deploydir_readme.txt
delete mode 100644 meta/recipes-devtools/file/file/ge-le.patch
delete mode 100644 meta/recipes-devtools/file/file/stringb-compat.patch
rename meta/recipes-devtools/file/{file_5.04.bb => file_5.07.bb} (79%)
rename meta/recipes-devtools/mtd/{mtd-utils-1.4.1 => mtd-utils-1.4.4}/add-exclusion-to-mkfs-jffs2-git-2.patch (100%)
rename meta/recipes-devtools/mtd/{mtd-utils_1.4.1.bb => mtd-utils_1.4.4.bb} (76%)
create mode 100644 meta/recipes-devtools/perl/perl-5.12.3/MM_Unix.pm.patch
delete mode 100644 meta/recipes-extended/procps/procps-3.2.8/install.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libxkbcommon/cross.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libxkbcommon_git.bbSignature · 1 line
1.7.6
[CONSOLIDATED PULL 01/32] image.bbclass, kernel.bbclass: create warning file about deleting deploydir files
From: Paul Eggleton <[email protected]>
New users sometimes delete files in tmp/deploy/images assuming they will be re-created just by re-running the build, and then are confused when this doesn't work. To discourage people from doing this, create a file called README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt in tmp/deploy/images containing an explanation of what needs to be done to re-create files there.
Fixes [YOCTO #1315] and [YOCTO #1346].
--- meta/classes/image.bbclass | 2 ++ meta/classes/kernel.bbclass | 2 ++ meta/files/deploydir_readme.txt | 8 ++++++++ 3 files changed, 12 insertions(+), 0 deletions(-) create mode 100644 meta/files/deploydir_readme.txt
meta/classes/image.bbclass +2 -0
@@ -138,6 +138,8 @@ fakeroot do_rootfs () { mkdir -p ${IMAGE_ROOTFS} mkdir -p ${DEPLOY_DIR_IMAGE} + cp -n ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOY_DIR_IMAGE}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt + if [ "${USE_DEVFS}" != "1" ]; then for devtable in ${@get_devtable_list(d)}; do makedevs -r ${IMAGE_ROOTFS} -D $devtable
meta/classes/kernel.bbclass +2 -0
@@ -500,6 +500,8 @@ kernel_do_deploy() { cd ${DEPLOYDIR} rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin + + cp -n ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt } do_deploy[dirs] = "${DEPLOYDIR} ${B}"
meta/files/deploydir_readme.txt new file +8 -0
@@ -0,0 +1,8 @@ +Files in the deploy directory will not be re-created automatically if you +delete them. If you do delete a file, you will need to run: + + bitbake -c clean TARGET + bitbake TARGET + +where TARGET is the name of the appropriate package or target e.g. +"virtual/kernel" for the kernel, an image, etc.
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 02/32] sanity.bbclass: add optional untested host distro warning
In reply to Saul WoldFrom: Paul Eggleton <[email protected]>
SANITY_TESTED_DISTROS, if specified, is expected to be a newline-delimited list of distro identifier strings, e.g.
SANITY_TESTED_DISTROS = " \
Ubuntu 11.04 \
Fedora release 14 (Laughlin) \
"(spaces, tabs etc. are trimmed)
If SANITY_TESTED_DISTROS is defined, we will attempt to detect the host distribution. If the distribution is not in SANITY_TESTED_DISTROS or we could not detect the distribution then we show a warning during sanity checking.
Provides the mechanism for fixing [YOCTO #1096].
--- meta/classes/sanity.bbclass | 48 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-)
meta/classes/sanity.bbclass +48 -0
@@ -118,6 +118,52 @@ def check_connectivity(d): return retval +def check_supported_distro(e): + tested_distros = e.data.getVar('SANITY_TESTED_DISTROS', True) + if not tested_distros: + return + + if os.path.exists("/etc/redhat-release"): + f = open("/etc/redhat-release", "r") + try: + distro = f.readline() + finally: + f.close() + elif os.path.exists("/etc/SuSE-release"): + f = open("/etc/SuSE-release", "r") + try: + distro = f.readline() + # Remove the architecture suffix e.g. (i586) + distro = re.sub(r' \([a-zA-Z0-9\-_]*\)$', '', distro).strip() + finally: + f.close() + else: + # Use LSB method + import subprocess as sub + try: + p = sub.Popen(['lsb_release','-d','-s'],stdout=sub.PIPE,stderr=sub.PIPE) + out, err = p.communicate() + distro = out.rstrip() + except Exception: + distro = None + + if not distro: + if os.path.exists("/etc/lsb-release"): + f = open("/etc/lsb-release", "r") + try: + for line in f: + lns = line.split('=') + if lns[0] == "DISTRIB_DESCRIPTION": + distro = lns[1].strip('"\n') + break + finally: + f.close() + if distro: + if distro not in [x.strip() for x in tested_distros.split('\n')]: + bb.warn('Host distribution "%s" has not been validated with this version of the build system; you may possibly experience unexpected failures. It is recommended that you use a tested distribution.' % distro) + else: + bb.warn('Host distribution could not be determined; you may possibly experience unexpected failures. It is recommended that you use a tested distribution.') + def check_sanity(e): from bb import note, error, data, __version__
@@ -249,6 +295,8 @@ def check_sanity(e): if pseudo_msg != "": messages = messages + pseudo_msg + '\n' + check_supported_distro(e) + # Check if DISPLAY is set if IMAGETEST is set 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'
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 03/32] qt4: allow a reduction in build time
In reply to Saul WoldFrom: Anders Darander <[email protected]>
When reducing build time by adding QT_DISTRO_FLAGS from the set '-no-gui -nomake tools -nomake examples -nomake demos -nomake docs', build failure can occur, due to not building all tools.
* Make rm not error out when removing one of the, possibly, non-existing tools.
* Only try to rename qtdemo, if qtdemo exists.
* Check if the phrasebook path exists, and only then call do_split_packages()
--- meta/recipes-qt/qt4/qt4.inc | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-)
meta/recipes-qt/qt4/qt4.inc +7 -6
@@ -227,10 +227,11 @@ python populate_packages_prepend() { phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d) phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d) - do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' ) + import os; + if os.path.exists(phrasebook_dir): + do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' ) # Package all the plugins and their -dbg version and create a meta package - import os def qtopia_split(path, name, glob): """ Split the package into a normal and -dbg package and then add the
@@ -278,11 +279,11 @@ do_install() { # These are host binaries, we should only use them in staging rm ${D}/${bindir}/qmake - rm ${D}/${bindir}/uic - rm ${D}/${bindir}/uic3 + rm -f ${D}/${bindir}/uic + rm -f ${D}/${bindir}/uic3 rm ${D}/${bindir}/moc rm ${D}/${bindir}/rcc - rm ${D}/${bindir}/lrelease + rm -f ${D}/${bindir}/lrelease # fix pkgconfig, libtool and prl files sed -i -e s#-L${S}/lib##g \
@@ -319,6 +320,6 @@ do_install() { #Append an E to the qtdemo file if [ -n "${QT_LIBINFIX}" ] ; then - mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX} + [ -f ${D}${bindir}/qtdemo ] && mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX} fi }
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 04/32] glib-2.0: explicitly disable dtrace and systemtap for native varaint
In reply to Saul WoldFrom: Joshua Lock <[email protected]>
This prevents systemtap and dtrace being picked up from the host as reported on the Yocto mailing list by Andre Haupt <[email protected]>
--- meta/recipes-core/glib-2.0/glib.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-core/glib-2.0/glib.inc +1 -1
@@ -26,7 +26,7 @@ inherit autotools pkgconfig gettext S = "${WORKDIR}/glib-${PV}" EXTRA_OECONF = "--disable-debug --enable-included-printf=no" -EXTRA_OECONF_virtclass-native = "" +EXTRA_OECONF_virtclass-native = "--disable-dtrace --disable-systemtap" EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no" FILES_${PN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}/bash_completion.d ${datadir}/glib-2.0/schemas"
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 05/32] tcl: fix networking breakage
In reply to Saul WoldFrom: Koen Kooi <[email protected]>
Without providing these site entries tcl networking doesn't work on the target.
Original OE commit:
commit 0c340037644f87054462f62b50cd397c162615b7
Author: Koen Kooi <[email protected]> Date: Wed May 26 13:04:18 2010 +0200
tcl: add 2 entries to arm-linux site file (possibly only glibc specific, need to check)
--- meta/recipes-devtools/tcltk/tcl_8.5.9.bb | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
meta/recipes-devtools/tcltk/tcl_8.5.9.bb +4 -2
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://../license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 file://../win/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \ " -PR = "r1" +PR = "r2" BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \ file://tcl-add-soname.patch"
@@ -30,7 +30,9 @@ inherit autotools DEPENDS_virtclass-native = "" -EXTRA_OECONF = "--enable-threads" +EXTRA_OECONF = "--enable-threads \ + tcl_cv_api_getaddrinfo=yes \ + " do_configure() { gnu-configize
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 07/32] busybox: Change ${PN} to ${BPN} in file names
In reply to Saul WoldFrom: Dongxiao Xu <[email protected]>
Some files in busybox are named with ${PN}. In multilib case, ${PN} will be prefixed with "lib32-" or "lib64-". Use ${BPN} instead.
--- meta/recipes-core/busybox/busybox.inc | 30 +++++++++++++------------- meta/recipes-core/busybox/busybox_1.18.4.bb | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-)
meta/recipes-core/busybox/busybox.inc +15 -15
@@ -29,7 +29,7 @@ INITSCRIPT_NAME_${PN}-mdev = "mdev" INITSCRIPT_PARAMS_${PN}-mdev = "start 06 S ." INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" INITSCRIPT_NAME_${PN}-udhcpc = "busybox-udhcpc" -CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf.${PN}" +CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf.${BPN}" CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf" RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc"
@@ -152,24 +152,24 @@ do_install () { install -d ${D}${libdir} ${D}${bindir} ${D}${sbindir} cat busybox.links | while read FILE; do NAME=`basename "$FILE"` - install -m 0755 "0_lib/$NAME" "${D}$FILE.${PN}" + install -m 0755 "0_lib/$NAME" "${D}$FILE.${BPN}" done # add suid bit where needed for i in `grep -E "APPLET.*_BB_SUID_((MAYBE|REQUIRE))" include/applets.h | grep -v _BB_SUID_DROP | cut -f 3 -d '(' | cut -f 1 -d ','`; do - find ${D} -name $i.${PN} -exec chmod a+s {} \; + find ${D} -name $i.${BPN} -exec chmod a+s {} \; done install -m 0755 0_lib/libbusybox.so.${PV} ${D}${libdir}/libbusybox.so.${PV} - ln -sf sh.${PN} ${D}${base_bindir}/sh - ln -sf ln.${PN} ${D}${base_bindir}/ln - ln -sf test.${PN} ${D}${bindir}/test - if [ -f ${D}/linuxrc.${PN} ]; then - mv ${D}/linuxrc.${PN} ${D}/linuxrc + ln -sf sh.${BPN} ${D}${base_bindir}/sh + ln -sf ln.${BPN} ${D}${base_bindir}/ln + ln -sf test.${BPN} ${D}${bindir}/test + if [ -f ${D}/linuxrc.${BPN} ]; then + mv ${D}/linuxrc.${BPN} ${D}/linuxrc fi fi if grep -q "CONFIG_SYSLOGD=y" ${WORKDIR}/defconfig; then - install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${PN} - install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf.${PN} + install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${BPN} + install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf.${BPN} fi if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
@@ -193,7 +193,7 @@ do_install () { install -m 0755 ${WORKDIR}/busybox-udhcpc ${D}${sysconfdir}/init.d/ fi if grep "CONFIG_INETD=y" ${WORKDIR}/defconfig; then - install -m 0755 ${WORKDIR}/inetd ${D}${sysconfdir}/init.d/inetd.${PN} + install -m 0755 ${WORKDIR}/inetd ${D}${sysconfdir}/init.d/inetd.${BPN} install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}/ fi if grep "CONFIG_MDEV=y" ${WORKDIR}/defconfig; then
@@ -217,8 +217,8 @@ pkg_postinst_${PN} () { } pkg_postinst_${PN}-syslog () { - update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${PN} 50 - update-alternatives --install ${sysconfdir}/syslog.conf syslog-conf syslog.conf.${PN} 50 + update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${BPN} 50 + update-alternatives --install ${sysconfdir}/syslog.conf syslog-conf syslog.conf.${BPN} 50 } pkg_prerm_${PN} () {
@@ -260,6 +260,6 @@ pkg_prerm_${PN}-syslog () { fi fi - update-alternatives --remove syslog-init syslog.${PN} - update-alternatives --remove syslog-conf syslog.conf.${PN} + update-alternatives --remove syslog-init syslog.${BPN} + update-alternatives --remove syslog-conf syslog.conf.${BPN} }
meta/recipes-core/busybox/busybox_1.18.4.bb +1 -1
@@ -1,5 +1,5 @@ require busybox.inc -PR = "r8" +PR = "r9" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://udhcpscript.patch \
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 08/32] sysvinit: Change ${PN} to ${BPN} in file names
In reply to Saul WoldFrom: Dongxiao Xu <[email protected]>
Some files in sysvinit are named with ${PN}. In multilib case, ${PN} will be prefixed with "lib32-" or "lib64-". Use ${BPN} instead.
--- meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 52 ++++++++++++------------ 1 files changed, 26 insertions(+), 26 deletions(-)
meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb +26 -26
@@ -5,7 +5,7 @@ SECTION = "base" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://COPYRIGHT;endline=15;md5=349c872e0066155e1818b786938876a4" -PR = "r4" +PR = "r5" RDEPENDS_${PN} = "${PN}-inittab"
@@ -65,41 +65,41 @@ do_install () { install -d ${D}${sysconfdir}/rc$level.d ln -s ../init.d/stop-bootlogd ${D}${sysconfdir}/rc$level.d/S99stop-bootlogd done - mv ${D}${base_sbindir}/init ${D}${base_sbindir}/init.${PN} - mv ${D}${base_bindir}/pidof ${D}${base_bindir}/pidof.${PN} - mv ${D}${base_sbindir}/halt ${D}${base_sbindir}/halt.${PN} - mv ${D}${base_sbindir}/reboot ${D}${base_sbindir}/reboot.${PN} - mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN} - mv ${D}${base_sbindir}/poweroff ${D}${base_sbindir}/poweroff.${PN} - mv ${D}${bindir}/last ${D}${bindir}/last.${PN} - mv ${D}${bindir}/mesg ${D}${bindir}/mesg.${PN} - mv ${D}${bindir}/wall ${D}${bindir}/wall.${PN} + mv ${D}${base_sbindir}/init ${D}${base_sbindir}/init.${BPN} + mv ${D}${base_bindir}/pidof ${D}${base_bindir}/pidof.${BPN} + mv ${D}${base_sbindir}/halt ${D}${base_sbindir}/halt.${BPN} + mv ${D}${base_sbindir}/reboot ${D}${base_sbindir}/reboot.${BPN} + mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${BPN} + mv ${D}${base_sbindir}/poweroff ${D}${base_sbindir}/poweroff.${BPN} + mv ${D}${bindir}/last ${D}${bindir}/last.${BPN} + mv ${D}${bindir}/mesg ${D}${bindir}/mesg.${BPN} + mv ${D}${bindir}/wall ${D}${bindir}/wall.${BPN} } pkg_postinst_${PN} () { - update-alternatives --install ${base_sbindir}/halt halt halt.${PN} 200 - update-alternatives --install ${base_sbindir}/reboot reboot reboot.${PN} 200 - update-alternatives --install ${base_sbindir}/shutdown shutdown shutdown.${PN} 200 - update-alternatives --install ${base_sbindir}/poweroff poweroff poweroff.${PN} 200 - update-alternatives --install ${bindir}/last last last.${PN} 200 - update-alternatives --install ${bindir}/mesg mesg mesg.${PN} 200 - update-alternatives --install ${bindir}/wall wall wall.${PN} 200 + update-alternatives --install ${base_sbindir}/halt halt halt.${BPN} 200 + update-alternatives --install ${base_sbindir}/reboot reboot reboot.${BPN} 200 + update-alternatives --install ${base_sbindir}/shutdown shutdown shutdown.${BPN} 200 + update-alternatives --install ${base_sbindir}/poweroff poweroff poweroff.${BPN} 200 + update-alternatives --install ${bindir}/last last last.${BPN} 200 + update-alternatives --install ${bindir}/mesg mesg mesg.${BPN} 200 + update-alternatives --install ${bindir}/wall wall wall.${BPN} 200 } pkg_prerm_${PN} () { - update-alternatives --remove halt halt.${PN} - update-alternatives --remove reboot reboot.${PN} - update-alternatives --remove shutdown shutdown.${PN} - update-alternatives --remove poweroff poweroff.${PN} - update-alternatives --remove last last.${PN} - update-alternatives --remove mesg mesg.${PN} - update-alternatives --remove wall wall.${PN} + update-alternatives --remove halt halt.${BPN} + update-alternatives --remove reboot reboot.${BPN} + update-alternatives --remove shutdown shutdown.${BPN} + update-alternatives --remove poweroff poweroff.${BPN} + update-alternatives --remove last last.${BPN} + update-alternatives --remove mesg mesg.${BPN} + update-alternatives --remove wall wall.${BPN} } pkg_postinst_sysvinit-pidof () { - update-alternatives --install ${base_bindir}/pidof pidof pidof.${PN} 200 + update-alternatives --install ${base_bindir}/pidof pidof pidof.${BPN} 200 } pkg_prerm_sysvinit-pidof () { - update-alternatives --remove pidof pidof.${PN} + update-alternatives --remove pidof pidof.${BPN} }
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 06/32] perl-native: Update find_perl to find the perl wrapper
In reply to Saul WoldFrom: Wenzong Fan <[email protected]>
[YOCTO #1157] [YOCTO #829]
This is a common issue to the packages which using 'MakeMaker.pm' to generate their Makefiles. The function 'find_perl()' in 'MM_Unix.pm' will be used to figure out the path/link of 'PERL/FULLPERL', but it always find the 'perl.real' instead of perl wrapper.
Just update it to find the perl wrapper correctly.
--- .../perl/perl-5.12.3/MM_Unix.pm.patch | 22 ++++++++++++++++++++ meta/recipes-devtools/perl/perl-native_5.12.3.bb | 5 ++- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/perl/perl-5.12.3/MM_Unix.pm.patch
meta/recipes-devtools/perl/perl-5.12.3/MM_Unix.pm.patch new file +22 -0
@@ -0,0 +1,22 @@ +Upstream-Status:Pending + +The perl-native should be relocatable while re-use sstate-cache from +another build, especially the original build was renamed/removed. + +To get the MakeMaker.pm works in this case, we need perl wrapper here +instead of real perl binary. + +Signed-off-by: Wenzong Fan <[email protected]> +=================================================================== +--- perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.orig 2011-08-12 16:07:30.000000000 +0800 ++++ perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 2011-08-12 16:08:56.000000000 +0800 +@@ -1019,6 +1019,9 @@ + } + + foreach my $name (@$names){ ++ # Getting MakeMaker.pm use perl wrapper instead of 'perl.real' directly ++ $name =~ s/perl\.real/perl/ if ($name =~ /perl\.real/); ++ + foreach my $dir (@$dirs){ + next unless defined $dir; # $self->{PERL_SRC} may be undefined + my ($abs, $val);
meta/recipes-devtools/perl/perl-native_5.12.3.bb +3 -2
@@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8" -PR = "r4" +PR = "r5" LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
@@ -19,7 +19,8 @@ SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \ file://parallel_build_fix_5.patch \ file://parallel_build_fix_6.patch \ file://native-nopacklist.patch \ - file://native-perlinc.patch" + file://native-perlinc.patch \ + file://MM_Unix.pm.patch" SRC_URI[md5sum] = "29975a69dce54e47fcd6331c085c6c99" SRC_URI[sha256sum] = "5678bfd5c2cd59253a26171bf3e681235433b00c730eea8a8046e1b225c11d2f"
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 09/32] qemu: modify search paths for libgl
In reply to Saul WoldFrom: Anders Darander <[email protected]>
On e.g. Debian libql is found under /usr/lib/x86_64-linux-gnu/libGL.so. Use a wildcard to match different locations, as uname -i only return unknown on Debian.
--- meta/recipes-devtools/qemu/qemu.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-devtools/qemu/qemu.inc +1 -1
@@ -26,7 +26,7 @@ do_configure_prepend_virtclass-native() { test -e /usr/lib/libGL.so -a -e /usr/lib/libGLU.so && libgl='yes' test -e /usr/lib64/libGL.so -a -e /usr/lib64/libGLU.so && libgl='yes' - test -e /usr/lib/`uname -i`-linux-gnu/libGL.so -a -e /usr/lib/`uname -i`-linux-gnu/libGLU.so && libgl='yes' + test -e /usr/lib/*-linux-gnu/libGL.so -a -e /usr/lib/*-linux-gnu/libGLU.so && libgl='yes' test -e /usr/lib/pkgconfig/sdl.pc -o -e /usr/lib64/pkgconfig/sdl.pc -o -e /usr/include/SDL/SDL.h && libsdl='yes'
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 11/32] mtd-utils: Added recipe of newer version 1.4.4.
In reply to Saul WoldFrom: Noor Ahsan <[email protected]>
* Added recipe of version 1.4.4 and removed 1.4.1 recipe and its patch files.
---
.../add-exclusion-to-mkfs-jffs2-git-2.patch | 0
.../mtd/{mtd-utils_1.4.1.bb => mtd-utils_1.4.4.bb} | 11 ++++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
rename meta/recipes-devtools/mtd/{mtd-utils-1.4.1 => mtd-utils-1.4.4}/add-exclusion-to-mkfs-jffs2-git-2.patch (100%)
rename meta/recipes-devtools/mtd/{mtd-utils_1.4.1.bb => mtd-utils_1.4.4.bb} (76%)meta/recipes-devtools/mtd/mtd-utils-1.4.4/add-exclusion-to-mkfs-jffs2-git-2.patch renamed from meta/recipes-devtools/mtd/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch +0 -0
meta/recipes-devtools/mtd/mtd-utils_1.4.4.bb renamed from meta/recipes-devtools/mtd/mtd-utils_1.4.1.bb +6 -5
@@ -6,12 +6,15 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c" -SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=3c3674a6e1d3f59554b0ff68ca59be2fd4134e0c \ - file://add-exclusion-to-mkfs-jffs2-git-2.patch;patch=1" +TAG = "v${PV}" + +SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=${TAG} \ + file://add-exclusion-to-mkfs-jffs2-git-2.patch;patch=1" + S = "${WORKDIR}/git/" -PR = "r1" +PR = "r0" EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'BUILDDIR=${S}'"
@@ -27,5 +30,3 @@ PARALLEL_MAKE = "" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "645519b753b364d52c4b941dcee3dd7e" -SRC_URI[sha256sum] = "51d6a77c7e673219bb89c4b119f336d9f2f5a5e065a12ecf9636c5348d099a0e"
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 12/32] libxkbcommon: new
In reply to Saul WoldFrom: Phil Blundell <[email protected]>
This is needed by Clutter's egl backend.
--- .../xorg-lib/libxkbcommon/cross.patch | 43 ++++++++++++++++++++ meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb | 22 ++++++++++ 2 files changed, 65 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-graphics/xorg-lib/libxkbcommon/cross.patch create mode 100644 meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb
meta/recipes-graphics/xorg-lib/libxkbcommon/cross.patch new file +43 -0
@@ -0,0 +1,43 @@ +Upstream-Status: Inappropriate +Signed-off-by: Phil Blundell <[email protected]> + +Use makekeys from -native package rather than trying to compile it here, and fix up +configure logic to find keysymdef.h in the sysroot. + +diff --git a/Makefile.am b/Makefile.am +index 2a4d448..214271f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,5 +1,5 @@ + # Order: makekeys before src +-SUBDIRS = include makekeys src test ++SUBDIRS = include src test + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = xkbcommon.pc +diff --git a/configure.ac b/configure.ac +index e6a8f15..7f2c387 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -74,7 +74,8 @@ PKG_CHECK_MODULES([X11], [xproto kbproto >= 1.0.4]) + + # Obtain the path to the X Window System Core Protocol + AC_MSG_CHECKING([for X11 includedir]) +-includex11dir="`$PKG_CONFIG --variable=includex11dir xproto`" ++m4_pattern_allow([PKG_CONFIG_SYSROOT_DIR]) ++includex11dir="$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includex11dir xproto`" + AC_MSG_RESULT([$includex11dir]) + + # Obtain full path for keysymdef header file +diff --git a/src/Makefile.am b/src/Makefile.am +index b9a12b9..c625b4c 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -26,5 +26,5 @@ libxkbcommon_la_SOURCES = \ + BUILT_SOURCES = ks_tables.h + CLEANFILES = $(BUILT_SOURCES) + +-ks_tables.h: $(top_builddir)/makekeys/makekeys$(EXEEXT) $(KEYSYMDEF_H) $(XF86KEYSYM_H) +- $(AM_V_GEN)cat $(KEYSYMDEF_H) $(XF86KEYSYM_H) | $(top_builddir)/makekeys/makekeys$(EXEEXT) > $@ ++ks_tables.h: $(KEYSYMDEF_H) $(XF86KEYSYM_H) ++ $(AM_V_GEN)cat $(KEYSYMDEF_H) $(XF86KEYSYM_H) | libxkbcommon-makekeys$(EXEEXT) > $@
meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb new file +22 -0
@@ -0,0 +1,22 @@ +require xorg-lib-common.inc + +SUMMARY = "library interface to the XKB compiler" + +LIC_FILES_CHKSUM = "file://COPYING;md5=469a86f811ec5d6bba592811c3005a2a" +PR = "r0" +DEPENDS = "xproto kbproto ${@['', '${PN}-native'][oe.utils.inherits(d, 'virtclass-native')]}" + +S = "${WORKDIR}/git" + +patches = "file://cross.patch" +patches_virtclass-native = "" + +SRC_URI = "git://anongit.freedesktop.org/xorg/lib/libxkbcommon \ + ${patches}" +SRCREV = "f91afe4f3ebcac3fb65a402c6c85cf1df5e2b52a" + +BBCLASSEXTEND = "native" + +do_install_append_virtclass-native() { + install -m 755 "makekeys/makekeys" "${STAGING_BINDIR}/libxkbcommon-makekeys" +}
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 10/32] scripts/runqemu: modify search paths for libgl
In reply to Saul WoldFrom: Anders Darander <[email protected]>
On e.g. Debian libql is found under /usr/lib/x86_64-linux-gnu/libGL.so. Use a wildcard to match different locations, as uname -i only return unknown on Debian.
--- scripts/runqemu | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
scripts/runqemu +1 -1
@@ -388,7 +388,7 @@ libgl='no' test -e /usr/lib/libGL.so -a -e /usr/lib/libGLU.so && libgl='yes' test -e /usr/lib64/libGL.so -a -e /usr/lib64/libGLU.so && libgl='yes' -test -e /usr/lib/`uname -i`-linux-gnu/libGL.so -a -e /usr/lib/`uname -i`-linux-gnu/libGLU.so && libgl='yes' +test -e /usr/lib/*-linux-gnu/libGL.so -a -e /usr/lib/*-linux-gnu/libGLU.so && libgl='yes' if [ "$libgl" != 'yes' ]; then echo "You need libGL.so and libGLU.so to exist in your library path to run the QEMU emulator.
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 14/32] at: make at usable for common user
In reply to Saul WoldFrom: Kang Kai <[email protected]>
Fixes [Yocto #1297]
The pkg_postinst was added to fix Yocto #675. But it seems not needed any more. Remove it then unprivilege user could use at.
--- meta/recipes-extended/at/at_3.1.12.bb | 26 +++++--------------------- 1 files changed, 5 insertions(+), 21 deletions(-)
meta/recipes-extended/at/at_3.1.12.bb +5 -21
@@ -4,11 +4,14 @@ the system load levels drop to a particular level." SECTION = "base" LICENSE="GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" -DEPENDS = "flex libpam initscripts \ +DEPENDS = "flex initscripts \ ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +RDEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)}" +PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits" + RCONFLICTS_${PN} = "atd" RREPLACES_${PN} = "atd" -PR = "r5" +PR = "r6" SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \ file://configure.patch \
@@ -56,23 +59,4 @@ do_install () { done } -pkg_postinst_${PN} () { - if [ "x$D" != "x" ] ; then - exit 1 - fi - - # below is necessary to allow at usable to normal users - # now at is has its own /var/spool/at instead of under /var/spool/cron - # this way is better to allow setgid on both sides - grep "^daemon" /etc/group || groupadd daemon - chown root:daemon /usr/bin/at - chmod 2755 /usr/bin/at - - chown root:daemon -R /var/spool/at - chmod 770 -R /var/spool/at - - chown root:daemon /etc/at.deny - chmod 640 /etc/at.deny -} - PARALLEL_MAKE = ""
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 13/32] libxslt: fix packaging of static libraries
In reply to Saul WoldFrom: Phil Blundell <[email protected]>
This prevents warnings about .a files being installed but not shipped.
--- meta/recipes-support/libxslt/libxslt_1.1.26.bb | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-)
meta/recipes-support/libxslt/libxslt_1.1.26.bb +8 -7
@@ -6,8 +6,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=0cd9a07afbeb24026c9b03aecfeba458" SECTION = "libs" -DEPENDS = "libxml2 (>=2.6.27)" -PR = "r1" +DEPENDS = "libxml2" +PR = "r2" SRC_URI = "ftp://xmlsoft.org/libxslt//libxslt-${PV}.tar.gz \ file://pkgconfig_fix.patch;patch=1"
@@ -16,13 +16,14 @@ SRC_URI[md5sum] = "e61d0364a30146aaa3001296f853b2b9" SRC_URI[sha256sum] = "55dd52b42861f8a02989d701ef716d6280bfa02971e967c285016f99c66e3db1" S = "${WORKDIR}/libxslt-${PV}" -inherit autotools pkgconfig binconfig +inherit autotools pkgconfig binconfig lib_package EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto" +# older versions of this recipe had ${PN}-utils +RPROVIDES_${PN}-bin += "${PN}-utils" +RCONFLICTS_${PN}-bin += "${PN}-utils" +RREPLACES_${PN}-bin += "${PN}-utils" -PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" - -FILES_${PN}-dev += "${bindir}/xslt-config" -FILES_${PN}-utils += "${bindir}" +FILES_${PN}-dev += "${bindir}/xsltConf.sh" BBCLASSEXTEND = "native"
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 15/32] conf, recipes: Redefine LINKER_HASH_STYLE
In reply to Saul WoldFrom: Khem Raj <[email protected]>
LINKER_HASH_STYLE is not set to either sysv or gnu depending upon architecture e.g. mips does not support gnu hash style among the supported architectures so we make sure its set to 'sysv' form mips
Linker flags are munged to adhere to renamed variable
Third option is to set it to 'both' we do
not do that by default but user can still set it
--- meta/conf/bitbake.conf | 4 ++-- meta/conf/distro/include/tcmode-default.inc | 6 +++++- meta/recipes-core/uclibc/uclibc.inc | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-)
meta/conf/bitbake.conf +2 -2
@@ -475,9 +475,9 @@ BUILDSDK_LDFLAGS = "-L${STAGING_LIBDIR} \ -Wl,-rpath-link,${STAGING_DIR_HOST}${base_libdir} \ -Wl,-rpath,${base_libdir} -Wl,-O1" -TARGET_LINK_HASH_STYLE ??= "" +LINKER_HASH_STYLE ??= "gnu" export LDFLAGS = "${TARGET_LDFLAGS}" -export TARGET_LDFLAGS = "-Wl,-O1 ${TARGET_LINK_HASH_STYLE}" +export TARGET_LDFLAGS = "-Wl,-O1 -Wl,--hash-style=${LINKER_HASH_STYLE}" #export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${libdir} \ # -Wl,-rpath-link,${STAGING_DIR_TARGET}${libdir} \ # -Wl,-O1"
meta/conf/distro/include/tcmode-default.inc +5 -1
@@ -63,5 +63,9 @@ PREFERRED_VERSION_gzip-native ?= "1.4" # Setup suitable toolchain flags require conf/distro/include/as-needed.inc -TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH', d, True) in ['mips', 'mipsel', 'mips64', 'mips64el']]}" +# mips does not support GNU hash style therefore we hard assign them +LINKER_HASH_STYLE_mips = "sysv" +LINKER_HASH_STYLE_mipsel = "sysv" +LINKER_HASH_STYLE_mips64 = "sysv" +LINKER_HASH_STYLE_mips64el = "sysv"
meta/recipes-core/uclibc/uclibc.inc +1 -1
@@ -201,5 +201,5 @@ do_configure() { do_install() { oe_runmake PREFIX=${D} install - oe_runmake PREFIX=${D} "SSP_ALL_CFLAGS=${TARGET_LINK_HASH_STYLE}" install_utils + oe_runmake PREFIX=${D} "SSP_ALL_CFLAGS=-Wl,--hash-style=${LINKER_HASH_STYLE}" install_utils }
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 16/32] gcc-4.6: Use --with-linker-hash-style configure option
In reply to Saul WoldFrom: Khem Raj <[email protected]>
Depending upon what hash style is in use this uses the right flag for setting the hash style type. This fixes the QA errors about missing GNU hash style reported in gcc-runtime build particularly libgcc
--- meta/recipes-devtools/gcc/gcc-4.6.inc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
meta/recipes-devtools/gcc/gcc-4.6.inc +2 -1
@@ -1,6 +1,6 @@ require gcc-common.inc -PR = "r7" +PR = "r8" # Third digit in PV should be incremented after a minor release # happens from this branch on gcc e.g. currently its 4.6.0
@@ -90,6 +90,7 @@ EXTRA_OECONF_BASE = " --enable-lto \ --disable-bootstrap \ --disable-libgomp \ --disable-libmudflap \ + --with-linker-hash-style=${LINKER_HASH_STYLE} \ --enable-cheaders=c_global " EXTRA_OECONF_INITIAL = "--disable-libmudflap \
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 18/32] gdb: Add lttng-ust to DEPENDS only for eglibc
In reply to Saul WoldFrom: Khem Raj <[email protected]>
--- meta/recipes-devtools/gdb/gdb-common.inc | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-)
meta/recipes-devtools/gdb/gdb-common.inc +9 -2
@@ -2,9 +2,16 @@ DESCRIPTION = "gdb - GNU debugger" HOMEPAGE = "http://www.gnu.org/software/gdb/" LICENSE="GPLv3+" SECTION = "devel" -DEPENDS = "ncurses readline elfutils lttng-ust" +DEPENDS = "ncurses readline elfutils ${LTTNGUST}" -INC_PR = "r2" +LTTNGUST = "lttng-ust" +LTTNGUST_libc-uclibc = "" +LTTNGUST_mips = "" +LTTNGUST_mipsel = "" +LTTNGUST_mips64 = "" +LTTNGUST_mips64el = "" + +INC_PR = "r3" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 17/32] task-core-tools: Use LTTNGUST variable instead of hardcoding lttng-ust
In reply to Saul WoldFrom: Khem Raj <[email protected]>
This helps build on uclibc where lttng-ust is not included
--- meta/recipes-core/tasks/task-core-tools.bb | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-core/tasks/task-core-tools.bb +3 -3
@@ -6,7 +6,7 @@ DESCRIPTION = "Tools tasks for OE-Core" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r10" +PR = "r11" PACKAGES = "\ task-core-tools-debug \
@@ -76,8 +76,8 @@ LTTNGUST_libc-uclibc = "" # MIPS. RDEPENDS_task-core-tools-profile_append_qemux86 = " valgrind lttng-ust ${SYSTEMTAP}" RDEPENDS_task-core-tools-profile_append_qemux86-64 = " ${LTTNGUST} ${SYSTEMTAP}" -RDEPENDS_task-core-tools-profile_append_qemuppc = " lttng-ust ${SYSTEMTAP}" -RDEPENDS_task-core-tools-profile_append_qemuarm = " lttng-ust" +RDEPENDS_task-core-tools-profile_append_qemuppc = " ${LTTNGUST} ${SYSTEMTAP}" +RDEPENDS_task-core-tools-profile_append_qemuarm = " ${LTTNGUST}" RDEPENDS_task-core-tools-testapps = "\ blktool \
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 19/32] task-core-boot: allow distribution to override default dev_manager provider with VIRTUAL-RUNTIME_dev_manager
In reply to Saul WoldFrom: Martin Jansa <[email protected]>
--- meta/recipes-core/tasks/task-core-boot.bb | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
meta/recipes-core/tasks/task-core-boot.bb +4 -1
@@ -17,6 +17,9 @@ PR = "r8" MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" +# Distro can override dev_manager provider +VIRTUAL-RUNTIME_dev_manager ?= "udev" + PACKAGES = "\ task-core-boot \ task-core-boot-dbg \
@@ -33,7 +36,7 @@ RDEPENDS_task-core-boot = "\ netbase \ sysvinit \ tinylogin \ - udev \ + ${VIRTUAL-RUNTIME_dev_manager} \ ${VIRTUAL-RUNTIME_update-alternatives} \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 21/32] initrdscripts: fix init-live.sh
In reply to Saul WoldFrom: Jingdong Lu <[email protected]>
Fix bug: [YOCTO #686]
Because the variable "ROOT_IMAGE" in init-live.sh is not correct, it fails to run when using liveCD. Modify value of "ROOT_IMAGE" to "isolinux/rootfs.img". If we want to use liveCD, we also need to add some kernel options related to CDROM support when compling kernel.
--- meta/recipes-core/initrdscripts/files/init-live.sh | 2 +- .../initrdscripts/initramfs-live-boot_1.0.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-core/initrdscripts/files/init-live.sh +1 -1
@@ -1,7 +1,7 @@ #!/bin/sh ROOT_MOUNT="/rootfs/" -ROOT_IMAGE=rootfs.img +ROOT_IMAGE="isolinux/rootfs.img" MOUNT="/bin/mount" UMOUNT="/bin/umount"
meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb +1 -1
@@ -3,7 +3,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" SRC_URI = "file://init-live.sh" -PR = "r3" +PR = "r4" do_install() { install -m 0755 ${WORKDIR}/init-live.sh ${D}/init
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 20/32] bluez4: update recipe from meta-oe
In reply to Saul WoldFrom: Martin Jansa <[email protected]>
* fix DEPENDS
* fix typo in --enable-pandd option
* remove unsupported options
* update packaging
* remove distro override which doesn't belong to oe-core
--- meta/recipes-connectivity/bluez/bluez4_4.96.bb | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-)
meta/recipes-connectivity/bluez/bluez4_4.96.bb +6 -11
@@ -7,12 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \ file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191" -DEPENDS = "gst-plugins-base alsa-lib libusb dbus-glib libnl" +DEPENDS = "udev gst-plugins-base alsa-lib libusb dbus-glib usbpath" RDEPENDS_${PN}-dev = "bluez-hcidump" -# For angstrom we want this to replace at least bluez-libs -PROVIDES_append_angstrom = " bluez-utils bluez-libs" - ASNEEDED = "" PR = "r0"
@@ -24,6 +21,7 @@ SRC_URI = "\ SRC_URI[md5sum] = "296111afac49e3f9035085ac14daf518" SRC_URI[sha256sum] = "c06fd50fd77909cad55e3181a42c6bce7cfcf7abb8cd87871c13d0d70f87fa99" + S = "${WORKDIR}/bluez-${PV}" inherit autotools
@@ -32,20 +30,16 @@ EXTRA_OECONF = "\ --enable-gstreamer \ --enable-alsa \ --enable-usb \ - --enable-netlink \ --enable-tools \ --enable-bccmd \ --enable-hid2hci \ --enable-dfutool \ --enable-hidd \ - --enable-pandd \ + --enable-pand \ --enable-dund \ --disable-cups \ --enable-test \ - --enable-manpages \ --enable-configfiles \ - --enable-initscripts \ - --disable-pcmciarules \ " do_install_append() {
@@ -59,8 +53,8 @@ do_install_append() { PACKAGES =+ "gst-plugin-bluez libasound-module-bluez" FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so" -FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so" -FILES_${PN} += "${libdir}/bluetooth/plugins/*.so" +FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa" +FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${base_libdir}/systemd/" FILES_${PN}-dev += "\ ${libdir}/bluetooth/plugins/*.la \ ${libdir}/alsa-lib/*.la \
@@ -70,4 +64,5 @@ FILES_${PN}-dev += "\ FILES_${PN}-dbg += "\ ${libdir}/bluetooth/plugins/.debug \ ${libdir}/*/.debug \ + ${base_libdir}/udev/.debug \ "
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 23/32] ea-acl: Use BPN instead of PN for style like lib${PN}
In reply to Saul WoldFrom: Dongxiao Xu <[email protected]>
When supporting multilib, ${PN} will be extended with MLPREFIX. However if a package name contains ${PN} with styles like lib${PN}, such extension will cause error. Use BPN in this case.
--- meta/recipes-support/attr/ea-acl.inc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-support/attr/ea-acl.inc +3 -3
@@ -18,9 +18,9 @@ do_install () { PACKAGES =+ "lib${BPN} lib${BPN}-dev lib${BPN}-doc" -FILES_lib${PN} = "${base_libdir}/lib*.so.*" +FILES_lib${BPN} = "${base_libdir}/lib*.so.*" -FILES_lib${PN}-dev = "${includedir} \ +FILES_lib${BPN}-dev = "${includedir} \ ${libdir}/lib*.so \ ${libdir}/lib*.a \ ${libdir}/lib*.la \
@@ -28,7 +28,7 @@ FILES_lib${PN}-dev = "${includedir} \ ${base_libdir}/lib*.a \ ${base_libdir}/lib*.la" -FILES_lib${PN}-doc = "${mandir}/man2 \ +FILES_lib${BPN}-doc = "${mandir}/man2 \ ${mandir}/man3" BBCLASSEXTEND = "native"
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 22/32] curl: Use BPN instead of PN for style like lib${PN}
In reply to Saul WoldFrom: Dongxiao Xu <[email protected]>
When supporting multilib, ${PN} will be extended with MLPREFIX. However if a package name contains ${PN} with styles like lib${PN}, such extension will cause error. Use BPN in this case.
--- meta/recipes-support/curl/curl_7.21.7.bb | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
meta/recipes-support/curl/curl_7.21.7.bb +4 -4
@@ -45,9 +45,9 @@ PACKAGE_ARCH_${PN}-certs = "all" FILES_${PN}-doc = "${mandir}/man1/curl.1" -FILES_lib${PN} = "${libdir}/lib*.so.*" -RRECOMMENDS_lib${PN} += "${PN}-certs" -FILES_lib${PN}-dev = "${includedir} \ +FILES_lib${BPN} = "${libdir}/lib*.so.*" +RRECOMMENDS_lib${BPN} += "${PN}-certs" +FILES_lib${BPN}-dev = "${includedir} \ ${libdir}/lib*.so \ ${libdir}/lib*.a \ ${libdir}/lib*.la \
@@ -55,7 +55,7 @@ FILES_lib${PN}-dev = "${includedir} \ ${datadir}/aclocal \ ${bindir}/*-config" -FILES_lib${PN}-doc = "${mandir}/man3 \ +FILES_lib${BPN}-doc = "${mandir}/man3 \ ${mandir}/man1/curl-config.1" BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 24/32] attr: Use BPN instead of PN for style like lib${PN}
In reply to Saul WoldFrom: Dongxiao Xu <[email protected]>
When supporting multilib, ${PN} will be extended with MLPREFIX. However if a package name contains ${PN} with styles like lib${PN}, such extension will cause error. Use BPN in this case.
--- meta/recipes-support/attr/attr.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-support/attr/attr.inc +1 -1
@@ -6,7 +6,7 @@ DEPENDS = "ncurses" LICENSE = "LGPLv2.1+ & GPLv2+" LICENSE_${PN} = "GPLv2+" -LICENSE_lib${PN} = "LGPLv2.1+" +LICENSE_lib${BPN} = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \ file://attr/attr.c;endline=17;md5=be0403261f0847e5f43ed5b08d19593c \ file://libattr/libattr.c;endline=17;md5=7970f77049f8fa1199fff62a7ab724fb"
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 25/32] acl: Use BPN instead of PN for style like lib${PN}
In reply to Saul WoldFrom: Dongxiao Xu <[email protected]>
When supporting multilib, ${PN} will be extended with MLPREFIX. However if a package name contains ${PN} with styles like lib${PN}, such extension will cause error. Use BPN in this case.
--- meta/recipes-support/attr/acl.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-support/attr/acl.inc +1 -1
@@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "LGPLv2.1+ & GPLv2+" LICENSE_${PN} = "GPLv2+" -LICENSE_lib${PN} = "LGPLv2.1+" +LICENSE_lib${BPN} = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \ file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764"
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 26/32] procps: Fix lib path to support multilib
In reply to Saul WoldFrom: Dongxiao Xu <[email protected]>
Remove the install.patch which hardcode the lib paths. Change ${PN} to ${BPN} in file names.
--- .../procps/procps-3.2.8/install.patch | 29 -------------------- meta/recipes-extended/procps/procps.inc | 3 +- meta/recipes-extended/procps/procps_3.2.8.bb | 8 +++--- 3 files changed, 5 insertions(+), 35 deletions(-) delete mode 100644 meta/recipes-extended/procps/procps-3.2.8/install.patch
meta/recipes-extended/procps/procps-3.2.8/install.patch deleted +0 -29
@@ -1,29 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- procps-3.2.5.virgin/Makefile 2005-01-26 05:55:26.000000000 +0100 -+++ procps-3.2.5/Makefile 2005-08-03 04:55:26.346984488 +0200 -@@ -30,7 +30,10 @@ - install := install -D --owner 0 --group 0 - - # Lame x86-64 /lib64 and /usr/lib64 abomination: --lib64 := lib$(shell [ -d /lib64 ] && echo 64) -+# lib64 := lib$(shell [ -d /lib64 ] && echo 64) -+ -+# Equally lame hack to work around makefile lameness when the host arch is 64bit, but the target is not. -+lib64 := lib - - usr/bin := $(DESTDIR)/usr/bin/ - bin := $(DESTDIR)/bin/ -@@ -211,10 +214,10 @@ - ###### install - - $(BINFILES) : all -- $(install) --mode a=rx $(notdir $@) $@ -+ $(install) -m 555 $(notdir $@) $@ - - $(MANFILES) : all -- $(install) --mode a=r $(notdir $@) $@ -+ $(install) -m 444 $(notdir $@) $@ - - install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL)) - cd $(usr/bin) && $(ln_f) skill snice
meta/recipes-extended/procps/procps.inc +1 -2
@@ -12,7 +12,6 @@ DEPENDS = "ncurses" FILES_${PN} += "${base_libdir}/libproc-*.so" -SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \ - file://install.patch" +SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz" inherit autotools
meta/recipes-extended/procps/procps_3.2.8.bb +4 -4
@@ -1,6 +1,6 @@ require procps.inc -PR = "r1" +PR = "r2" inherit update-rc.d update-alternatives
@@ -22,10 +22,10 @@ SRC_URI += "file://procmodule.patch \ SRC_URI[md5sum] = "9532714b6846013ca9898984ba4cd7e0" SRC_URI[sha256sum] = "11ed68d8a4433b91cd833deb714a3aa849c02aea738c42e6b4557982419c1535" -FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \ - ${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \ +FILES = "${bindir}/top.${BPN} ${base_bindir}/ps.${BPN} ${bindir}/uptime.${BPN} ${base_bindir}/kill.${BPN} \ + ${bindir}/free.${BPN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \ ${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \ - ${base_sbindir}/sysctl.${PN}" + ${base_sbindir}/sysctl.${BPN}" CONFFILES_${PN} = "${sysconfdir}/sysctl.conf"
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 27/32] eglibc: check dependencies among eglibc options
In reply to Saul WoldFrom: Kang Kai <[email protected]>
Fixes [Yocto #1212]
'libc-inet' and 'ipv4' are the same thing, so remove 'libc-inet' from the default DISTRO_FEATURES_LIBC in file default-distrovars.inc.
Check the dependencies among eglibc configurable options, make sure that eglibc could be compile successfully only with part of the options.
--- meta/conf/distro/include/default-distrovars.inc | 2 +- meta/recipes-core/eglibc/eglibc-options.inc | 75 ++++++++++++++++++++++- 2 files changed, 75 insertions(+), 2 deletions(-)
meta/conf/distro/include/default-distrovars.inc +1 -1
@@ -12,7 +12,7 @@ LOCALE_UTF8_ONLY ?= "0" DISTRO_FEATURES_LIBC ?= "ipv4 ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \ libc-crypt-ufc libc-db-aliases libc-envz libc-fcvt libc-fmtmsg libc-fstab libc-ftraverse \ - libc-getlogin libc-idn libc-inet libc-inet-anl libc-libm libc-libm-big libc-locales libc-locale-code \ + libc-getlogin libc-idn libc-inet-anl libc-libm libc-libm-big libc-locales libc-locale-code \ libc-memusage libc-nis libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams libc-sunrpc \ libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \ libc-posix-wchar-io"
meta/recipes-core/eglibc/eglibc-options.inc +74 -1
91 lines not on this page · raw message
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 28/32] mailx: update license and distro tracking fileds
In reply to Saul WoldFrom: Kang Kai <[email protected]>
update mailx license and bump up PR, and update distro tracking fields.
--- .../conf/distro/include/distro_tracking_fields.inc | 9 +++++++-- meta/recipes-extended/mailx/mailx_12.5.bb | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +7 -2
@@ -5699,8 +5699,13 @@ RECIPE_MAINTAINER_pn-docbook-utils = "Scott Garman <[email protected]>" RECIPE_LATEST_VERSION_pn-task-qte-toolchain-target = "1.0" RECIPE_MANUAL_CHECK_DATE_pn-task-qte-toolchain-target = "Feb 28, 2011" DISTRO_PN_ALIAS_pn-task-qte-toolchain-target = "Intel" -RECIPE_LATEST_VERSION_pn-mailx = "12.4" -RECIPE_MANUAL_CHECK_DATE_pn-mailx = "Feb 28, 2011" + +RECIPE_STATUS_pn-mailx = "green" +RECIPE_LATEST_VERSION_pn-mailx = "12.5" +RECIPE_LAST_UPDATE_pn-mailx = "Jul 1, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-mailx = "Jul 28, 2011" +RECIPE_MAINTAINER_pn-mailx = "Kai Kang <[email protected]>" + RECIPE_LATEST_VERSION_pn-libgcc = "4.5.1" RECIPE_MANUAL_CHECK_DATE_pn-libgcc = "Feb 28, 2011"
meta/recipes-extended/mailx/mailx_12.5.bb +2 -2
@@ -6,8 +6,8 @@ for MIME, IMAP, POP3, SMTP, and S/MIME." HOMEPAGE = "http://heirloom.sourceforge.net/mailx.html" SECTION = "console/network" -PR = "r0" -LICENSE = "GPL" +PR = "r1" +LICENSE = "BSD & MPL-1" LIC_FILES_CHKSUM = "file://COPYING;md5=4202a0a62910cf94f7af8a3436a2a2dd" SRC_URI = "${DEBIAN_MIRROR}/main/h/heirloom-mailx/heirloom-mailx_${PV}.orig.tar.gz;name=archive \
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 30/32] alsa-tools: update license and add distro tracking fields
In reply to Saul WoldFrom: Kang Kai <[email protected]>
Update license and other informations, then bump up PR. Update distro tracking fields.
--- .../conf/distro/include/distro_tracking_fields.inc | 7 ++++--- .../recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb | 11 +++++++---- 2 files changed, 11 insertions(+), 7 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +4 -3
@@ -5770,10 +5770,11 @@ RECIPE_COMMENTS_pn-rxvt-unicode = "" RECIPE_LAST_UPDATE_pn-rxvt-unicode = "May 25, 2011" RECIPE_MAINTAINER_pn-rxvt-unicode = "Saul Wold <[email protected]>" -RECIPE_STATUS_pn-alsa-tools = "red" +RECIPE_STATUS_pn-alsa-tools = "green" RECIPE_LATEST_VERIONS_pn-alsa-tools = "1.0.24.1 -RECIPE_LAST_UPDATE_pn-alsa-tools = "Jan 31, 2011" -RECIPE_MANUAL_CHECK_DATE_pn-alsa-tools = "Jun 7, 2011" +RECIPE_LAST_UPDATE_pn-alsa-tools = "Jul 28, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-alsa-tools = "Jul 28, 2011" +RECIPE_MAINTAINER_pn-alsa-tools = "Kai Kang <[email protected]>" RECIPE_STATUS_pn-mesa-demos = "red" RECIPE_LATEST_VERSION_pn-mesa-demos = "8.0.1"
meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb +7 -4
@@ -1,13 +1,16 @@ BROKEN = "1" -DESCRIPTION = "Alsa Tools" +DESCRIPTION = "Alsa Tools package contains advanced tools for certain sound cards." +HOMEPAGE = "http://www.alsa-project.org" +BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php" SECTION = "console/utils" -LICENSE = "GPLv2" +LICENSE = "GPLv2 & LGPLv2+" DEPENDS = "alsa-lib ncurses" -PR = "r2" +PR = "r3" -LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://ld10k1/COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2 \ file://autotools.patch"
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 29/32] slang: add homepage and update distro tracking fields
In reply to Saul WoldFrom: Kang Kai <[email protected]>
Add slang homepage and bump up PR.
Update distro tracking fields.
--- .../conf/distro/include/distro_tracking_fields.inc | 5 +++-- meta/recipes-extended/slang/slang_2.2.4.bb | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +3 -2
@@ -5731,8 +5731,9 @@ RECIPE_MAINTAINER_pn-linuxdoc-tools = "Scott Garman <[email protected]>" RECIPE_STATUS_pn-slang = "green" RECIPE_LATEST_VERSION_pn-slang = "2.2.4" -RECIPE_LAST_UPDATE_pn-slang = "Apr 10, 2011" -RECIPE_MANUAL_CHECK_DATE_pn-slang = "Jun 6, 2011" +RECIPE_LAST_UPDATE_pn-slang = "Jul 28, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-slang = "Jun 28, 2011" +RECIPE_MAINTAINER_pn-slang = "Kai Kang <[email protected]>" RECIPE_STATUS_pn-libnewt = "green" RECIPE_LATEST_VERSION_pn-libnewt = "0.52.12"
meta/recipes-extended/slang/slang_2.2.4.bb +2 -1
@@ -7,9 +7,10 @@ The S-Lang library, provided in this package, provides the S-Lang \ extension language. S-Lang's syntax resembles C, which makes it easy \ to recode S-Lang procedures in C if you need to." +HOMEPAGE = "http://www.jedsoft.org/slang/" SECTION = "libs" DEPENDS = "pcre" -PR = "r5" +PR = "r6" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=a52a18a472d4f7e45479b06563717c02"
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 32/32] file: new file version 5.07
In reply to Saul WoldFrom: Adrian Alonso <[email protected]>
* file version 5.07 also prevents magic file mistmatch in Fedora 15
* related to bug 1358.
http://bugzilla.pokylinux.org/show_bug.cgi?id=1358
* v2 remove previous file version 5.04
remove unused patchs
---
meta/recipes-devtools/file/file/ge-le.patch | 72 --------------------
.../file/file/stringb-compat.patch | 31 ---------
.../file/{file_5.04.bb => file_5.07.bb} | 9 +--
3 files changed, 3 insertions(+), 109 deletions(-)
delete mode 100644 meta/recipes-devtools/file/file/ge-le.patch
delete mode 100644 meta/recipes-devtools/file/file/stringb-compat.patch
rename meta/recipes-devtools/file/{file_5.04.bb => file_5.07.bb} (79%)meta/recipes-devtools/file/file/ge-le.patch deleted +0 -72
@@ -1,72 +0,0 @@ -Upstream-Status: Pending - -`>=' and `<=' was silently ignored in previous version, -but causes an warning in file 5.04. Add support for these -two operators as a feature extension, however, users should -not rely on them. - -8/17/2010 - created by Qing He <[email protected]> - -diff --git a/src/apprentice.c b/src/apprentice.c -index 3d4c3cf..a2b86ed 100644 ---- a/src/apprentice.c -+++ b/src/apprentice.c -@@ -1396,11 +1396,10 @@ parse(struct magic_set *ms, struct magic_entry **mentryp, uint32_t *nmentryp, - m->reln = *l; - ++l; - if (*l == '=') { -- if (ms->flags & MAGIC_CHECK) { -- file_magwarn(ms, "%c= not supported", -- m->reln); -- return -1; -- } -+ if (m->reln == '>') -+ m->reln = 'g'; -+ else if (m->reln == '<') -+ m->reln = 'l'; - ++l; - } - break; -diff --git a/src/softmagic.c b/src/softmagic.c -index d8a5675..1648e43 100644 ---- a/src/softmagic.c -+++ b/src/softmagic.c -@@ -1955,6 +1955,38 @@ magiccheck(struct magic_set *ms, struct magic *m) - } - break; - -+ case 'g': -+ if (m->flag & UNSIGNED) { -+ matched = v >= l; -+ if ((ms->flags & MAGIC_DEBUG) != 0) -+ (void) fprintf(stderr, "%llu >= %llu = %d\n", -+ (unsigned long long)v, -+ (unsigned long long)l, matched); -+ } -+ else { -+ matched = (int64_t) v >= (int64_t) l; -+ if ((ms->flags & MAGIC_DEBUG) != 0) -+ (void) fprintf(stderr, "%lld >= %lld = %d\n", -+ (long long)v, (long long)l, matched); -+ } -+ break; -+ -+ case 'l': -+ if (m->flag & UNSIGNED) { -+ matched = v <= l; -+ if ((ms->flags & MAGIC_DEBUG) != 0) -+ (void) fprintf(stderr, "%llu <= %llu = %d\n", -+ (unsigned long long)v, -+ (unsigned long long)l, matched); -+ } -+ else { -+ matched = (int64_t) v <= (int64_t) l; -+ if ((ms->flags & MAGIC_DEBUG) != 0) -+ (void) fprintf(stderr, "%lld <= %lld = %d\n", -+ (long long)v, (long long)l, matched); -+ } -+ break; -+ - case '&': - matched = (v & l) == l; - if ((ms->flags & MAGIC_DEBUG) != 0)
meta/recipes-devtools/file/file/stringb-compat.patch deleted +0 -31
@@ -1,31 +0,0 @@ -Upstream-Status: Pending - -`B' in file 4.x has the same meaning with `W' in file 5, -let `B' be an alias of `W'. - -8/17/2010 - created by Qing He <[email protected]> - -diff --git a/src/apprentice.c b/src/apprentice.c -index 58826c3..3d4c3cf 100644 ---- a/src/apprentice.c -+++ b/src/apprentice.c -@@ -1340,6 +1340,7 @@ parse(struct magic_set *ms, struct magic_entry **mentryp, uint32_t *nmentryp, - "zero range"); - l = t - 1; - break; -+ case CHAR_COMPACT_BLANK: - case CHAR_COMPACT_WHITESPACE: - m->str_flags |= STRING_COMPACT_WHITESPACE; - break; -diff --git a/src/file.h b/src/file.h -index c07f2d4..42cf416 100644 ---- a/src/file.h -+++ b/src/file.h -@@ -282,6 +282,7 @@ struct magic { - #define STRING_TEXTTEST BIT(5) - #define STRING_BINTEST BIT(6) - #define CHAR_COMPACT_WHITESPACE 'W' -+#define CHAR_COMPACT_BLANK 'B' - #define CHAR_COMPACT_OPTIONAL_WHITESPACE 'w' - #define CHAR_IGNORE_LOWERCASE 'c' - #define CHAR_IGNORE_UPPERCASE 'C'
meta/recipes-devtools/file/file_5.07.bb renamed from meta/recipes-devtools/file/file_5.04.bb +3 -6
@@ -10,16 +10,14 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03 DEPENDS = "zlib file-native" DEPENDS_virtclass-native = "zlib-native" -PR = "r2" +PR = "r0" SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \ - file://stringb-compat.patch \ - file://ge-le.patch \ file://dump \ file://filesystems" -SRC_URI[md5sum] = "accade81ff1cc774904b47c72c8aeea0" -SRC_URI[sha256sum] = "4c9e6e7994e74cb3386374ae91b055d26ac96b9d3e82fd157ae2d62e87a4260c" +SRC_URI[md5sum] = "b8d1f9a8a644067bd0a703cebf3f4858" +SRC_URI[sha256sum] = "c968bfe97d87f9f564728a894d57be2c6bba9a2006763fffff85c5f72a9a3c2f" inherit autotools
@@ -35,5 +33,4 @@ do_install_append_virtclass-native() { --magic-file ${datadir}/misc/magic.mgc } - BBCLASSEXTEND = "native"
Signature · 1 line
1.7.6
[CONSOLIDATED PULL 31/32] newt: update distro tracking fields
In reply to Saul WoldFrom: Kang Kai <[email protected]>
Update newt distro tracking fields
--- .../conf/distro/include/distro_tracking_fields.inc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +4 -4
@@ -5736,10 +5736,10 @@ RECIPE_MANUAL_CHECK_DATE_pn-slang = "Jun 28, 2011" RECIPE_MAINTAINER_pn-slang = "Kai Kang <[email protected]>" RECIPE_STATUS_pn-libnewt = "green" -RECIPE_LATEST_VERSION_pn-libnewt = "0.52.12" -RECIPE_LAST_UPDATE_pn-libnewt = "Aug 06, 2010" -RECIPE_MANUAL_CHECK_DATE_pn-libnewt = "Jun 4, 2011" -RECIPE_NO_UPDATE_REASON_pn-libnewt = "" +RECIPE_LATEST_VERSION_pn-libnewt = "0.52.13" +RECIPE_MAINTAINER_pn-libnewt = "Kai Kang <[email protected]>" +RECIPE_LAST_UPDATE_pn-libnewt = "Jul 27, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-libnewt = "Jul 27, 2011" RECIPE_STATUS_pn-createrepo = "green" RECIPE_LATEST_VERSION_pn-createrepo = "0.9.9"
Signature · 1 line
1.7.6
Re: [CONSOLIDATED PULL 15/32] conf, recipes: Redefine LINKER_HASH_STYLE
In reply to Saul WoldQuoted 11 lines · Saul Wold
From: Khem Raj <[email protected]>
LINKER_HASH_STYLEis not set to either sysv or gnu depending upon architecture e.g. mips does not support gnu hash style among the supported architectures so we make sure its set to 'sysv' form mipsLinker flags are munged to adhere to renamed variable
Third option is to set it to 'both' we do
not do that by default but user can still set it
It wasn't totally obvious to me why this patch is a good thing. Can you explain why this change is desirable?
Also, I found the first paragraph of the description above quite hard to understand. Do you think you could try to reword it to be a bit clearer?
p.
Re: [CONSOLIDATED PULL 26/32] procps: Fix lib path to support multilib
In reply to Saul WoldQuoted 22 lines · Saul Wold
From: Dongxiao Xu <[email protected]>
Remove the install.patch which hardcode the lib paths. Change ${PN} to ${BPN} in file names.
Signed-off-by Dongxiao Xu <[email protected]>--- .../procps/procps-3.2.8/install.patch | 29 -------------------- meta/recipes-extended/procps/procps.inc | 3 +- meta/recipes-extended/procps/procps_3.2.8.bb | 8 +++--- 3 files changed, 5 insertions(+), 35 deletions(-) delete mode 100644 meta/recipes-extended/procps/procps-3.2.8/install.patchmeta/recipes-extended/procps/procps-3.2.8/install.patch deleted +0
-3@@ -1,29 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- procps-3.2.5.virgin/Makefile 2005-01-26 05:55:26.000000000 +0100
meta/recipes-extended/procps/procps-3.2.8/install.patch line 13
Quoted 10 lines
meta/recipes-extended/procps/procps-3.2.8/install.patch deleted +0
-10-+++ procps-3.2.5/Makefile 2005-08-03 04:55:26.346984488 +0200 -@@ -30,7 +30,10 @@ - install := install -D --owner 0 --group 0 - - # Lame x86-64 /lib64 and /usr/lib64 abomination: --lib64 := lib$(shell [ -d /lib64 ] && echo 64) -+# lib64 := lib$(shell [ -d /lib64 ] && echo 64) -+ -+# Equally lame hack to work around makefile lameness when the host arch is 64bit, but the target is not. -+lib64 := lib
Both these cases are plain wrong. We can't simply drop this patch since we may be building 64 bit on a 32 bit system and /lib64 may not exist. Dropping the patch will therefore fix some cases and break others (e.g. what a about x32?).
We likely need to heavier patch the Makefile.
Cheers,
Richard
Re: [CONSOLIDATED PULL 15/32] conf, recipes: Redefine LINKER_HASH_STYLE
In reply to Phil BlundellQuoted 13 lines · Phil Blundell
Quoted 11 lines · Saul Wold
From: Khem Raj <[email protected]>
LINKER_HASH_STYLEis not set to either sysv or gnu depending upon architecture e.g. mips does not support gnu hash style among the supported architectures so we make sure its set to 'sysv' form mipsLinker flags are munged to adhere to renamed variable
Third option is to set it to 'both' we do
not do that by default but user can still set it
Quoted 6 lines
It wasn't totally obvious to me why this patch is a good thing. Can you explain why this change is desirable?
Also, I found the first paragraph of the description above quite hard to understand. Do you think you could try to reword it to be a bit clearer?
Agreed, I'm also having trouble understanding this change. I guess its related to the options passed into gcc but I suspect we can just improve the gcc option handling instead.
What I don't like about this patch is forcing a string into LDFLAGS and I much prefer the current approach where its either added or its not, its not just adding a parameter through the variable.
Also, if mips doesn't support this, how is anything at all working at the moment?
Cheers,
Richard
Re: [CONSOLIDATED PULL 12/32] libxkbcommon: new
In reply to Saul WoldQuoted 79 lines · Saul Wold
From: Phil Blundell <[email protected]>
This is needed by Clutter's egl backend.
Signed-off-by Phil Blundell <[email protected]>--- .../xorg-lib/libxkbcommon/cross.patch | 43 ++++++++++++++++++++ meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb | 22 ++++++++++ 2 files changed, 65 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-graphics/xorg-lib/libxkbcommon/cross.patch create mode 100644 meta/recipes-graphics/xorg-lib/libxkbcommon_git.bbmeta/recipes-graphics/xorg-lib/libxkbcommon/cross.patch new file +43
-0@@ -0,0 +1,43 @@ +Upstream-Status: Inappropriate +Signed-off-by: Phil Blundell <[email protected]> + +Use makekeys from -native package rather than trying to compile it here, and fix up +configure logic to find keysymdef.h in the sysroot. + +diff --git a/Makefile.am b/Makefile.am +index 2a4d448..214271f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,5 +1,5 @@ + # Order: makekeys before src +-SUBDIRS = include makekeys src test ++SUBDIRS = include src test + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = xkbcommon.pc +diff --git a/configure.ac b/configure.ac +index e6a8f15..7f2c387 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -74,7 +74,8 @@ PKG_CHECK_MODULES([X11], [xproto kbproto >= 1.0.4]) + + # Obtain the path to the X Window System Core Protocol + AC_MSG_CHECKING([for X11 includedir]) +-includex11dir="`$PKG_CONFIG --variable=includex11dir xproto`" ++m4_pattern_allow([PKG_CONFIG_SYSROOT_DIR]) ++includex11dir="$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includex11dir xproto`" + AC_MSG_RESULT([$includex11dir]) + + # Obtain full path for keysymdef header file +diff --git a/src/Makefile.am b/src/Makefile.am +index b9a12b9..c625b4c 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -26,5 +26,5 @@ libxkbcommon_la_SOURCES = \ + BUILT_SOURCES = ks_tables.h + CLEANFILES = $(BUILT_SOURCES) + +-ks_tables.h: $(top_builddir)/makekeys/makekeys$(EXEEXT) $(KEYSYMDEF_H) $(XF86KEYSYM_H) +- $(AM_V_GEN)cat $(KEYSYMDEF_H) $(XF86KEYSYM_H) | $(top_builddir)/makekeys/makekeys$(EXEEXT) > $@ ++ks_tables.h: $(KEYSYMDEF_H) $(XF86KEYSYM_H) ++ $(AM_V_GEN)cat $(KEYSYMDEF_H) $(XF86KEYSYM_H) | libxkbcommon-makekeys$(EXEEXT) > $@meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb new file +12
-0@@ -0,0 +1,22 @@ +require xorg-lib-common.inc + +SUMMARY = "library interface to the XKB compiler" + +LIC_FILES_CHKSUM = "file://COPYING;md5=469a86f811ec5d6bba592811c3005a2a" +PR = "r0" +DEPENDS = "xproto kbproto ${@['', '${PN}-native'][oe.utils.inherits(d, 'virtclass-native')]}" + +S = "${WORKDIR}/git" + +patches = "file://cross.patch" +patches_virtclass-native = ""
meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb line 22
Quoted 10 lines
meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb new file +10
-0+ +SRC_URI = "git://anongit.freedesktop.org/xorg/lib/libxkbcommon \ + ${patches}" +SRCREV = "f91afe4f3ebcac3fb65a402c6c85cf1df5e2b52a" + +BBCLASSEXTEND = "native" + +do_install_append_virtclass-native() { + install -m 755 "makekeys/makekeys" "${STAGING_BINDIR}/libxkbcommon-makekeys" +}
What isthe version getting set to for this recipe?
Cheers,
Richard
Re: [CONSOLIDATED PULL 11/32] mtd-utils: Added recipe of newer version 1.4.4.
In reply to Saul WoldQuoted 24 lines · Saul Wold
From: Noor Ahsan <[email protected]>
* Added recipe of version 1.4.4 and removed 1.4.1 recipe and its patch files.
Signed-off-by Noor Ahsan <[email protected]>--- .../add-exclusion-to-mkfs-jffs2-git-2.patch | 0 .../mtd/{mtd-utils_1.4.1.bb => mtd-utils_1.4.4.bb} | 11 ++++++----- 2 files changed, 6 insertions(+), 5 deletions(-) rename meta/recipes-devtools/mtd/{mtd-utils-1.4.1 => mtd-utils-1.4.4}/add-exclusion-to-mkfs-jffs2-git-2.patch (100%) rename meta/recipes-devtools/mtd/{mtd-utils_1.4.1.bb => mtd-utils_1.4.4.bb} (76%)meta/recipes-devtools/mtd/mtd-utils-1.4.4/add-exclusion-to-mkfs-jffs2-git-2.patch renamed from meta/recipes-devtools/mtd/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch +0
-0meta/recipes-devtools/mtd/mtd-utils_1.4.4.bb renamed from meta/recipes-devtools/mtd/mtd-utils_1.4.1.bb +0
-0
meta/recipes-devtools/mtd/mtd-utils_1.4.4.bb LICENSE = "GPLv2+" · line 13
Quoted 10 lines
meta/recipes-devtools/mtd/mtd-utils_1.4.4.bb renamed from meta/recipes-devtools/mtd/mtd-utils_1.4.1.bb +5
-2@@ -6,12 +6,15 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c" -SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=3c3674a6e1d3f59554b0ff68ca59be2fd4134e0c \ - file://add-exclusion-to-mkfs-jffs2-git-2.patch;patch=1" +TAG = "v${PV}" + +SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=${TAG} \ + file://add-exclusion-to-mkfs-jffs2-git-2.patch;patch=1" +
This will force network lookups to resolve the tag into a revision. We need to specify the revision here, a least in OE-Core.
Cheers,
Richard
Re: [CONSOLIDATED PULL 05/32] tcl: fix networking breakage
In reply to Saul WoldQuoted 31 lines · Saul Wold
From: Koen Kooi <[email protected]>
Without providing these site entries tcl networking doesn't work on the target.
Original OE commit:
commit
0c340037644f87054462f62b50cd397c162615b7Author: Koen Kooi <[email protected]> Date: Wed May 26 13:04:18 2010 +0200tcl: add 2 entries to arm-linux site file (possibly only glibc specific, need to check)
Signed-off-by Koen Kooi <[email protected]>--- meta/recipes-devtools/tcltk/tcl_8.5.9.bb | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)meta/recipes-devtools/tcltk/tcl_8.5.9.bb +1
-1@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://../license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 file://../win/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \ " -PR = "r1" +PR = "r2" BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \ file://tcl-add-soname.patch"
meta/recipes-devtools/tcltk/tcl_8.5.9.bb inherit autotools · line 36
Quoted 8 lines
meta/recipes-devtools/tcltk/tcl_8.5.9.bb +3
-1@@ -30,7 +30,9 @@ inherit autotools DEPENDS_virtclass-native = "" -EXTRA_OECONF = "--enable-threads" +EXTRA_OECONF = "--enable-threads \ + tcl_cv_api_getaddrinfo=yes \ + "
Why are we adding these in the recipe rather than the site files? I can see the reasons why we might but it does seem to be a change in behaviour/policy?
Cheers,
Richard
Re: [CONSOLIDATED PULL 12/32] libxkbcommon: new
In reply to Richard PurdieQuoted 1 line · Richard Purdie
What isthe version getting set to for this recipe?
Just "git" at the moment, which I suppose is a bit suboptimal. What's the recommended string for packages that don't have any upstream release?
p.
Re: [CONSOLIDATED PULL 03/32] qt4: allow a reduction in build time
In reply to Saul WoldQuoted 20 lines · Saul Wold
From: Anders Darander <[email protected]>
When reducing build time by adding
QT_DISTRO_FLAGSfrom the set '-no-gui -nomake tools -nomake examples -nomake demos -nomake docs', build failure can occur, due to not building all tools.* Make rm not error out when removing one of the, possibly, non-existing tools.
* Only try to rename qtdemo, if qtdemo exists.
* Check if the phrasebook path exists, and only then calldo_split_packages()Signed-off-by Anders Darander <[email protected]>--- meta/recipes-qt/qt4/qt4.inc | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-)meta/recipes-qt/qt4/qt4.inc +0
-0
meta/recipes-qt/qt4/qt4.inc python populate_packages_prepend() { · line 233
Quoted 10 lines
meta/recipes-qt/qt4/qt4.inc +3
-2@@ -227,10 +227,11 @@ python populate_packages_prepend() { phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d) phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d) - do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' ) + import os; + if os.path.exists(phrasebook_dir): + do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' ) # Package all the plugins and their -dbg version and create a meta package - import os
For reference, BitBake assumes that both os and bb are always imported so we can likely drop all "import os" references. I'll take this patch since its harmless but I did just grep the classes directory and it looks like we can clean up those imports a little.
Cheers,
Richard
Re: [CONSOLIDATED PULL 12/32] libxkbcommon: new
In reply to Phil BlundellQuoted 6 lines · Phil Blundell
Quoted 1 line · Richard Purdie
What isthe version getting set to for this recipe?
Just "git" at the moment, which I suppose is a bit suboptimal. What's the recommended string for packages that don't have any upstream release?
http://cgit.freedesktop.org/xorg/lib/libxkbcommon/tree/configure.ac
says:AC_INIT([libxkbcommon], [0.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
In such cases I'm using
PV = "0.1.0+gitr${SRCPV}"
even when there isn't any 0.1.0 tarball yet
problem is when content of such repo is realease as 0.1.0 tarball later..
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [CONSOLIDATED PULL 15/32] conf, recipes: Redefine LINKER_HASH_STYLE
In reply to Richard PurdieQuoted 9 lines · Richard Purdie
Quoted 8 lines · Phil Blundell
Quoted 7 lines · Saul Wold
From: Khem Raj<[email protected]>
LINKER_HASH_STYLEis not set to either sysv or gnu depending upon architecture e.g. mips does not support gnu hash style among the supported architectures so we make sure its set to 'sysv' form mips
Quoted 7 lines
Quoted 7 lines
Quoted 4 lines
Linker flags are munged to adhere to renamed variable
Third option is to set it to 'both' we do
not do that by default but user can still set itIt wasn't totally obvious to me why this patch is a good thing. Can you explain why this change is desirable?
when we build libraries within gcc e.g. libgcc or libstdc++ etc. then
it does not respect injection of LDFLAGS as we do so if we set hash style to gnu then it does not get passed to build environment of those runtime libraries. Now one may argue that its a bug in gcc but I would rather like to use provisions gcc provides.
This patch makes ways for us to specify linker style options to gcc configure.
but the bigger problem is that I forgot to attach the gcc patch that adds this options to gcc configury:) that however does not impact this patch so much but the next one where I enable the gcc options.
Quoted 4 lines
Quoted 4 lines
Also, I found the first paragraph of the description above quite hard to understand. Do you think you could try to reword it to be a bit clearer?
Yes I had a typo in there
LINKER_HASH_STYLE is not set to either sysv or gnu
should have been
LINKER_HASH_STYLE is now set to either sysv or gnu
Quoted 9 lines
Agreed, I'm also having trouble understanding this change. I guess its related to the options passed into gcc but I suspect we can just improve the gcc option handling instead.
What I don't like about this patch is forcing a string into LDFLAGS and I much prefer the current approach where its either added or its not, its not just adding a parameter through the variable.
Yes default is sysv so if you do not specify anything then linker assumes sysv but since barring mips we pass this option to all architecture there should be not much impact on other architectures than mips.
Quoted 2 lines
Also, if mips doesn't support this, how is anything at all working at the moment?
see last line in distro/include/tcmode-default.inc
TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH', d, True) in ['mips', 'mipsel', 'mips64', 'mips64el']]}"
Quoted 10 lines
Cheers,
Richard
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [CONSOLIDATED PULL 12/32] libxkbcommon: new
In reply to Martin JansaQuoted 12 lines · Martin Jansa
Quoted 6 lines · Phil Blundell
Quoted 1 line · Richard Purdie
What isthe version getting set to for this recipe?
Just "git" at the moment, which I suppose is a bit suboptimal. What's the recommended string for packages that don't have any upstream release?
http://cgit.freedesktop.org/xorg/lib/libxkbcommon/tree/configure.ac
says:AC_INIT([libxkbcommon], [0.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
Quoted 7 lines
In such cases I'm using
PV = "0.1.0+gitr${SRCPV}"even when there isn't any 0.1.0 tarball yet
problem is when content of such repo is realease as 0.1.0 tarball later..
I'd just go for "0.0.0+gitr${SRCPV}" which would only then break is upstream releases a 0.0.0.1 which is hopefully unlikely :)
Cheers,
Richard
Re: [CONSOLIDATED PULL 15/32] conf, recipes: Redefine LINKER_HASH_STYLE
In reply to Khem RajQuoted 8 lines · Khem Raj
Quoted 2 lines
Also, if mips doesn't support this, how is anything at all working at the moment?
see last line in distro/include/tcmode-default.inc
TARGET_LINK_HASH_STYLE?= "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH', d, True) in ['mips', 'mipsel', 'mips64', 'mips64el']]}"
So given that, why can't we just add TARGET_LINK_HASH_STYLE to gcc's EXTRA_OECONF?
Cheers,
Richard
Quoted 62 lines · Saul Wold
The following changes since commit
2e83e6755441cb14bd907d306974338c15173189:kernel: restore crtsavres.o to enable building external modules on powerpc (2011-08-17 15:46:16 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contribsgw/stage
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stageAdrian Alonso (1):
file: new file version 5.07Anders Darander (3):
qt4: allow a reduction in build time
qemu: modify search paths for libgl
scripts/runqemu: modify search paths for libglDongxiao Xu (7):
busybox: Change ${PN} to ${BPN} in file names
sysvinit: Change ${PN} to ${BPN} in file names
curl: Use BPN instead of PN for style like lib${PN}
ea-acl: Use BPN instead of PN for style like lib${PN}
attr: Use BPN instead of PN for style like lib${PN}
acl: Use BPN instead of PN for style like lib${PN}
procps: Fix lib path to support multilibJingdong Lu (1):
initrdscripts: fixinit-live.shJoshua Lock (1):
glib-2.0: explicitly disable dtrace and systemtap for native varaintKang Kai (6):
at: make at usable for common user
eglibc: check dependencies among eglibc options
mailx: update license and distro tracking fileds
slang: add homepage and update distro tracking fields
alsa-tools: update license and add distro tracking fields
newt: update distro tracking fieldsKhem Raj (4):
conf,recipes: RedefineLINKER_HASH_STYLE
gcc-4.6: Use --with-linker-hash-style configure option
task-core-tools: Use LTTNGUST variable instead of hardcoding
lttng-ust
gdb: Add lttng-ust to DEPENDS only for eglibcKoen Kooi (1):
tcl: fix networking breakageMartin Jansa (2):
task-core-boot: allow distribution to override defaultdev_manager
provider with VIRTUAL-RUNTIME_dev_manager
bluez4: update recipe from meta-oeNoor Ahsan (1):
mtd-utils: Added recipe of newer version 1.4.4.Paul Eggleton (2):
image.bbclass, kernel.bbclass: create warning file about deleting
deploydir files
sanity.bbclass: add optional untested host distro warning
Quoted 6 lines
Phil Blundell (2):
libxkbcommon: new
libxslt: fix packaging of static librariesWenzong Fan (1):
perl-native: Updatefind_perlto find the perl wrapper
Thanks for putting this together Saul. I've either merged these or commented on the mailing list.
Cheers,
Richard
Re: [CONSOLIDATED PULL 16/32] gcc-4.6: Use --with-linker-hash-style configure option
In reply to Saul Woldmeta/recipes-devtools/gcc/gcc-4.6.inc EXTRA_OECONF_BASE = " --enable-lto \ · line 96
Quoted 10 lines · Saul Wold
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.6.0meta/recipes-devtools/gcc/gcc-4.6.inc +1
-0@@ -90,6 +90,7 @@ EXTRA_OECONF_BASE = " --enable-lto \ --disable-bootstrap \ --disable-libgomp \ --disable-libmudflap \ + --with-linker-hash-style=${LINKER_HASH_STYLE} \ --enable-cheaders=c_global " EXTRA_OECONF_INITIAL = "--disable-libmudflap \
Which gcc did you test this against? As far as I can tell this patch was only applied to the trunk (as of May this year) and not the 4.6 branch. The corresponding configury certainly doesn't seem to exist in the oe-core build tree that I happen to have lying around in front of me, so it isn't apparent that this patch will have any useful effect.
p.
Re: [CONSOLIDATED PULL 15/32] conf, recipes: Redefine LINKER_HASH_STYLE
In reply to Richard PurdieQuoted 4 lines · Richard Purdie
Quoted 3 lines · Khem Raj
Quoted 2 lines
Also, if mips doesn't support this, how is anything at all working at the moment?
Quoted 8 lines
Quoted 5 lines
see last line in distro/include/tcmode-default.inc
TARGET_LINK_HASH_STYLE?= "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH', d, True) in ['mips', 'mipsel', 'mips64', 'mips64el']]}"So given that, why can't we just add
TARGET_LINK_HASH_STYLEto gcc'sEXTRA_OECONF?
if you mean the configure option --with-linker-hash-style then yes we can and certainly we can get rid of TARGET_LINK_HASH_STYLE altogether then however
the patch I backported only for gcc 4.6 certainly can be done for 4.5 and I left it in there mainly for
prebuilt external toolchains. since we don't control how those prebuilt toolchains are configured
Quoted 11 lines
Cheers,
Richard
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [CONSOLIDATED PULL 16/32] gcc-4.6: Use --with-linker-hash-style configure option
In reply to Phil BlundellQuoted 10 lines · Phil Blundell
Quoted 9 lines · Saul Wold
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.6.0meta/recipes-devtools/gcc/gcc-4.6.inc +1
-0@@ -90,6 +90,7 @@ EXTRA_OECONF_BASE = " --enable-lto \ --disable-bootstrap \ --disable-libgomp \ --disable-libmudflap \ + --with-linker-hash-style=${LINKER_HASH_STYLE} \--enable-cheaders=c_global "
Quoted 8 lines
Quoted 1 line
EXTRA_OECONF_INITIAL = "--disable-libmudflap \
Which gcc did you test this against? As far as I can tell this patch was only applied to the trunk (as of May this year) and not the 4.6 branch. The corresponding configury certainly doesn't seem to exist in the oe-core build tree that I happen to have lying around in front of me, so it isn't apparent that this patch will have any useful effect.
Yes that patch is missing
I noted it in mail to other thread. the patch was being applied in meta-oe. I will redo these 2 patches and resend
Quoted 9 lines
p.
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [CONSOLIDATED PULL 16/32] gcc-4.6: Use --with-linker-hash-style configure option
Quoted 20 lines · Khem Raj
Quoted 10 lines · Phil Blundell
Quoted 9 lines · Saul Wold
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.6.0meta/recipes-devtools/gcc/gcc-4.6.inc +1
-0@@ -90,6 +90,7 @@ EXTRA_OECONF_BASE = " --enable-lto \ --disable-bootstrap \ --disable-libgomp \ --disable-libmudflap \ + --with-linker-hash-style=${LINKER_HASH_STYLE} \--enable-cheaders=c_global "
Quoted 8 lines
Quoted 1 line
EXTRA_OECONF_INITIAL = "--disable-libmudflap \
Which gcc did you test this against? As far as I can tell this patch was only applied to the trunk (as of May this year) and not the 4.6 branch. The corresponding configury certainly doesn't seem to exist in the oe-core build tree that I happen to have lying around in front of me, so it isn't apparent that this patch will have any useful effect.
Quoted 3 lines
Yes that patch is missing
I noted it in mail to other thread. the patch was being applied in meta-oe. I will redo these 2 patches and resend
I have pushed what I am testing again right now its here
http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/linker-hash-choice
Quoted 11 lines
Quoted 10 lines
p.
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [CONSOLIDATED PULL 21/32] initrdscripts: fix init-live.sh
In reply to Saul WoldQuoted 8 lines · Saul Wold
From: Jingdong Lu <[email protected]>
Fix bug: [YOCTO #686]
Because the variable "ROOT_IMAGE" ininit-live.shis not correct, it fails to run when using liveCD. Modify value of "ROOT_IMAGE" to "isolinux/rootfs.img". If we want to use liveCD, we also need to add some kernel options related to CDROM support when compling kernel.
This causes hddimgs to no longer work. e.g. trying to boot jasperforest, sugarbay, or fri2 using a -live hddimg, the boot hangs with the following or something similar:
input: Plus More Enterprise LTD. USB-compliant keyboard as /devices/pci0000:00/0 000:00:1a.0/usb1/1-1/1-1.3/1-1.3:1.0/input/input4
generic-usb 0003:0518:0001.0002: input: USB HID v1.10 Keyboard [Plus More Enterp rise LTD. USB-compliant keyboard] on usb-0000:00:1a.0-1.3/input0
input: Plus More Enterprise LTD. USB-compliant keyboard as /devices/pci0000:00/0 000:00:1a.0/usb1/1-1/1-1.3/1-1.3:1.1/input/input5
generic-usb 0003:0518:0001.0003: input: USB HID v1.10 Mouse [Plus More Enterpris e LTD. USB-compliant keyboard] on usb-0000:00:1a.0-1.3/input1
scsi 6:0:0:0: Direct-Access SMI USB DISK 1100 PQ: 0 ANSI: 0 CCS
sd 6:0:0:0: Attached scsi generic sg2 type 0
sd 6:0:0:0: [sdb] 3915776 512-byte logical blocks: (2.00 GB/1.86 GiB) sd 6:0:0:0: [sdb] Write Protect is off
sd 6:0:0:0: [sdb] No Caching mode page present
sd 6:0:0:0: [sdb] Assuming drive cache: write through
sd 6:0:0:0: [sdb] No Caching mode page present
sd 6:0:0:0: [sdb] Assuming drive cache: write through
sdb:
sd 6:0:0:0: [sdb] No Caching mode page present
sd 6:0:0:0: [sdb] Assuming drive cache: write through
sd 6:0:0:0: [sdb] Attached SCSI removable disk
Reverting commit 30ba9839a2dfcd144c3369644c00e1551b820b33 fixes the problem.
Tom
Quoted 32 lines
Signed-off-by Jingdong Lu <[email protected]>--- meta/recipes-core/initrdscripts/files/init-live.sh | 2 +- .../initrdscripts/initramfs-live-boot_1.0.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)meta/recipes-core/initrdscripts/files/init-live.sh +1
-1@@ -1,7 +1,7 @@ #!/bin/sh ROOT_MOUNT="/rootfs/" -ROOT_IMAGE=rootfs.img +ROOT_IMAGE="isolinux/rootfs.img" MOUNT="/bin/mount" UMOUNT="/bin/umount"meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb +1
-1@@ -3,7 +3,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" SRC_URI = "file://init-live.sh" -PR = "r3" +PR = "r4" do_install() { install -m 0755 ${WORKDIR}/init-live.sh ${D}/init