Re: [OE-core] [dylan, master][PATCH] autotools.bbclass: Fix race with sed-native
s...@linux.intel.com writes: >> diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass >> index 66c0f5d..2bb2aa3 100644 >> --- a/meta/classes/autotools.bbclass >> +++ b/meta/classes/autotools.bbclass >> @@ -7,17 +7,25 @@ def autotools_dep_prepend(d): >> >> if pn in ['autoconf-native', 'automake-native', 'help2man-native']: >> return deps >> -deps += 'autoconf-native automake-native ' >> +deps += 'autoconf-native automake-native gnu-config-native ' >> > You don't mention anything about this change. This might be a moot topic, but maybe I did miss something here: I thought it was implied in the “light refactoring”. In the original code, 'gnu-config-native ' would have always been appended by this point in the code. I thought the "if ...: return deps" idiom would greatly simplify this function, but in order to use it, 'gnu-config-native ' needs to be appended before each return. So just append it here. > Sau! -- Richard Tollerton ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [dylan, master][PATCH] autotools.bbclass: Fix race with sed-native
richard.pur...@linuxfoundation.org writes: > On Fri, 2013-10-04 at 20:22 -0700, Saul Wold wrote: >> On 10/04/2013 04:35 PM, Richard Tollerton wrote: >> This also starts to create more front end bottle next on autotools >> related items before we can really start to parallelize the build. >> >> More thought is required on this. > > Please have a look at the sed-native changes that went into master > recently as I think this issue has been fixed differently... Indeed, I agree that commit db2eb325 would fix the race... nd this also makes me 2-for-2 this month on reinventing the wheel. :'( But this brings up a question I've been meaning to ask. Build reproducibility is reduced (all other things being equal) as more external dependencies are introduced. So I would have expected that The Right Thing here would have been to specify -native packages as explicit dependencies (just like it's always important to comprehensively enumerate dependencies). Not to add specific short-circuits to use the system package. sed's probably a bad example here since it is rather well-behaved -- surely this sort of issue comes up for many other packages, though... I know that the OE build is horribly slow, but is it really so slow as to require short-circuiting native package dependencies such as this? Has there been a general architectural decision made over this sort of thing? (I'm sorry, I tried to search for one on the mailing list and wiki, but couldn't find any.) > > Cheers, > > Richard -- Richard Tollerton ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2 1/1] sysvinit: fix missing of boot log
ping On 09/26/2013 06:02 PM, qi.c...@windriver.com wrote: From: Chen Qi Previously, our system had no boot log even if the bootlogd daemon was started correctly. The root cause is that the log file doesn't exist when starting the bootlogd. Add '-c' option to bootlogd so that it will create the boot log if it doesn't exist. Besides, we need to make sure that tmpfs has been mounted. Otherwise, the boot log will still be missing. [YOCTO #5273] Signed-off-by: Chen Qi --- meta/recipes-core/sysvinit/sysvinit/bootlogd.init |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/sysvinit/sysvinit/bootlogd.init b/meta/recipes-core/sysvinit/sysvinit/bootlogd.init index 7b87827..3a10a3c 100755 --- a/meta/recipes-core/sysvinit/sysvinit/bootlogd.init +++ b/meta/recipes-core/sysvinit/sysvinit/bootlogd.init @@ -42,14 +42,15 @@ esac case "$ACTION" in start) + mount -a -t tmpfs 2>/dev/null echo -n "Starting $DESC: " if [ -d /proc/1/. ] then umask 027 start-stop-daemon --start --quiet \ - --exec $DAEMON -- -r + --exec $DAEMON -- -r -c else - $DAEMON -r + $DAEMON -r -c fi echo "$NAME." ;; ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv2 00/14] Deterministic dependencies II
On Mon, 2013-10-07 at 15:16 +0200, Martin Jansa wrote: > On Mon, Oct 07, 2013 at 10:32:13AM +0100, Burton, Ross wrote: > > On 5 October 2013 13:22, Martin Jansa wrote: > > > Martin Jansa (14): > > > gstreamer1.0-libav: Add PACKAGECONFIG for orc > > > libunique: Add PACKAGECONFIG for dbus > > > aspell: Add PACKAGECONFIG for curses > > > xf86-input-synaptics: Add dependency on libxtst > > > xdpyinfo: Add dependency on libxcomposite > > > matchbox-wm: Add dependency on libxfixes and libxcursor > > > telepathy-mission-control: Add PACKAGECONFIG for upower and > > > connectivity > > > tcl: Add dependency on zlib > > > wget: Add dependency on libpcre > > > x11vnc: Add PACKAGECONFIG for xinerama > > > glib-networking: Add PACKAGECONFIG for p11-kit > > > lame: Add dependency on ncurses > > > subversion: Add dependency on file for libmagic > > > systemd: Add PACKAGECONFIG for cryptsetup > > > > All looks good to me. Worth noting that the telepathy-mission-control > > changes will need changing when 5.15.1 onwards is integrated, and it's > > clear that matchbox-wm needs to share a .inc file. > > matchbox-wm and telepathy-mission-control weren't merged, should I send > v3 for them? The others seemed obvious so I took them into the 1.5 release. Those two were not as obvious so they didn't make the release. I haven't got around to worrying about 1.6 patches yet... Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] OE Changelog since 2013-09-29 until 2013-10-06
Changelog since 2013-09-29 until 2013-10-06. Projects included in this report: bitbake: git://git.openembedded.org/bitbake openembedded-core: git://git.openembedded.org/openembedded-core meta-openembedded: git://git.openembedded.org/meta-openembedded meta-angstrom: git://github.com/Angstrom-distribution/meta-angstrom.git meta-arago: git://arago-project.org/git/meta-arago.git meta-beagleboard: git://github.com/beagleboard/meta-beagleboard.git meta-browser: git://github.com/OSSystems/meta-browser.git meta-bug: git://github.com/buglabs/meta-bug.git meta-chicken: git://github.com/OSSystems/meta-chicken meta-efikamx: git://github.com/kraj/meta-efikamx.git meta-ettus: http://github.com/koenkooi/meta-ettus.git meta-fsl-arm: git://git.yoctoproject.org/meta-fsl-arm meta-fsl-arm-extra: git://github.com/Freescale/meta-fsl-arm-extra.git meta-fsl-ppc: git://git.yoctoproject.org/meta-fsl-ppc meta-guacamayo: git://github.com/Guacamayo/meta-guacamayo.git meta-gumstix: git://github.com/gumstix/meta-gumstix.git meta-gumstix-community: git://gitorious.org/schnitzeltony-oe-meta/meta-gumstix-community.git meta-handheld: git://git.openembedded.org/meta-handheld meta-igep: http://github.com/ebutera/meta-igep.git meta-intel: git://git.yoctoproject.org/meta-intel meta-ivi: git://git.yoctoproject.org/meta-ivi meta-java: git://github.com/woglinde/meta-java meta-kde: git://gitorious.org/openembedded-core-layers/meta-kde.git meta-micro: git://git.openembedded.org/meta-micro meta-mono: git://git.yoctoproject.org/meta-mono.git meta-netbookpro: git://github.com/tworaz/meta-netbookpro meta-nslu2: git://github.com/kraj/meta-nslu2 meta-opie: git://git.openembedded.org/meta-opie meta-qt3: git://git.yoctoproject.org/meta-qt3 meta-qt5: git://github.com/meta-qt5/meta-qt5.git meta-slugos: git://github.com/kraj/meta-slugos meta-systemd: git://git.yoctoproject.org/meta-systemd meta-raspberrypi: git://github.com/djwillis/meta-raspberrypi.git meta-smartphone: http://git.shr-project.org/repo/meta-smartphone.git meta-ti: git://git.yoctoproject.org/meta-ti meta-webos: git://github.com/openwebos/meta-webos.git meta-xilinx: git://git.yoctoproject.org/meta-xilinx meta-yocto: git://git.yoctoproject.org/meta-yocto openembedded: git://git.openembedded.org/openembedded Changelog for bitbake: Cristiana Voicu (1): bitbake/hob: removing extra parameters from conf files using hob Erik Botö (1): lib/bb/monitordisk.py: fix spelling in error text Paul Eggleton (4): bitbake-diffsigs: handle if task name is specified without do_ prefix bitbake-diffsigs: refactor argument parsing slightly bitbake-diffsigs: improve error handling bitbake-dumpsig: introduce command line and error handling Richard Purdie (5): bin/bitbake: Catch establish connection log messages xmlrpc: Show a better error message for connection failures bin/bitbake: No need to show tracebacks for BBHandledExceptions bin/bitbake: Clear ui-queue when starting a server bin/bitbake: Clarify server error message Ross Burton (1): utils: use logger.warn instead of print in copyfile Valentin Popa (1): HOB: MACHINE should be saved in conf files using ?= Changelog for openembedded-core: Bruce Ashfield (1): linux-yocto: enable CONFIG_INPUT_EVDEV as standard policy Cristian Iorga (1): connman-conf: add a global public DNS to network provisioning David Nyström (2): nativesdk-packagegroup-sdk-host: Add nativesdk-makedevs nss: Fix return codes in postinstall Eric Bénard (1): qemu: fix nativesdk build without x11 Jason Wessel (2): kernel.bbclass: Allow INITRAMFS_TASK to trigger copy initramfs code mkefidisk.sh: Allow using a loopback mounted file Jonathan Liu (2): boot-directdisk: ensure generated MBR disk signature is non-zero boot-directdisk: avoid loop in MBR disk signature generation Marius Avram (1): slang: fix sprintf bug concerning 8-bit characters Mark Hatle (2): package_rpm.bbclass: Workaround failure in attemptonly installs run-postinst: Ensure that the postinsts are ordered Martin Jansa (12): xdpyinfo: Add dependency on libxcomposite xf86-input-synaptics: Add dependency on libxtst aspell: Add PACKAGECONFIG for curses libunique: Add PACKAGECONFIG for dbus gstreamer1.0-libav: Add PACKAGECONFIG for orc wget: Add dependency on libpcre tcl: Add dependency on zlib x11vnc: Add PACKAGECONFIG for xinerama glib-networking: Add PACKAGECONFIG for p11-kit lame: Add dependency on ncurses subversion: Add dependency on file for libmagic systemd: Add PACKAGECONFIG for cryptsetup Muhammad Shakeel (3): opkg: Use systemd service for first boot configuration opkg: ignore result of opkg configure systemd-compat-units: Use correct run-postinsts script link Nathan Rossi (1): linux-dummy.bb: Resolve missing task issues Paul Eggleton (2): psplash: copy image files from workdir instead of next to recipe dbus: fix QA error bui
[OE-core] [PATCH 4/5] at-spi2-core: upgrade to 2.10.0.
Signed-off-by: Ross Burton --- meta/recipes-support/atk/at-spi2-core_2.10.0.bb | 17 + meta/recipes-support/atk/at-spi2-core_2.8.0.bb | 17 - 2 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 meta/recipes-support/atk/at-spi2-core_2.10.0.bb delete mode 100644 meta/recipes-support/atk/at-spi2-core_2.8.0.bb diff --git a/meta/recipes-support/atk/at-spi2-core_2.10.0.bb b/meta/recipes-support/atk/at-spi2-core_2.10.0.bb new file mode 100644 index 000..a6ff734 --- /dev/null +++ b/meta/recipes-support/atk/at-spi2-core_2.10.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "Assistive Technology Service Provider Interface (dbus core)" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" + +MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" + +SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "bb3b6f5679ecfc7dabcf76a1b6bfe2db" +SRC_URI[sha256sum] = "964155c7574220a00e11e1c0d91f2d3017ed603920eb1333ff9cbdb6a22744db" + +DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native" + +inherit autotools gtk-doc + +EXTRA_OECONF = "--disable-introspection --disable-xevie" + +FILES_${PN} += "${datadir}/dbus-1/services/*.service" diff --git a/meta/recipes-support/atk/at-spi2-core_2.8.0.bb b/meta/recipes-support/atk/at-spi2-core_2.8.0.bb deleted file mode 100644 index 8403d65..000 --- a/meta/recipes-support/atk/at-spi2-core_2.8.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Assistive Technology Service Provider Interface (dbus core)" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" - -MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" - -SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "93b57d5d56d15d1222ddf2386e2f869f" -SRC_URI[sha256sum] = "1861a30fc7f583d5a567a0ba547db67ce9bd294f0d1c9f7403c96a10a481c458" - -DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native" - -inherit autotools gtk-doc - -EXTRA_OECONF = "--disable-introspection --disable-xevie" - -FILES_${PN} += "${datadir}/dbus-1/services/*.service" -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] at-spi2-gtk: upgrade to 2.10.0
Signed-off-by: Ross Burton --- meta/recipes-support/atk/at-spi2-atk_2.10.0.bb | 19 +++ meta/recipes-support/atk/at-spi2-atk_2.8.1.bb | 19 --- 2 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 meta/recipes-support/atk/at-spi2-atk_2.10.0.bb delete mode 100644 meta/recipes-support/atk/at-spi2-atk_2.8.1.bb diff --git a/meta/recipes-support/atk/at-spi2-atk_2.10.0.bb b/meta/recipes-support/atk/at-spi2-atk_2.10.0.bb new file mode 100644 index 000..f8cb4e6 --- /dev/null +++ b/meta/recipes-support/atk/at-spi2-atk_2.10.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "AT-SPI 2 Toolkit Bridge" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" + +MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" + +SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "38e4f7e2898f7ba3cc3ec269d9402789" +SRC_URI[sha256sum] = "dea7ff2f9bc9bbdb0351112616d738de718b55739cd2511afecac51604c31a94" + +DEPENDS = "dbus glib-2.0 atk at-spi2-core" + +inherit autotools + +PACKAGES =+ "${PN}-gnome ${PN}-gtk2" + +FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules" +FILES_${PN}-gtk2 = "${libdir}/gtk-2.0/modules/libatk-bridge.*" +FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug" diff --git a/meta/recipes-support/atk/at-spi2-atk_2.8.1.bb b/meta/recipes-support/atk/at-spi2-atk_2.8.1.bb deleted file mode 100644 index 32cbe3b..000 --- a/meta/recipes-support/atk/at-spi2-atk_2.8.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "AT-SPI 2 Toolkit Bridge" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" - -MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" - -SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "854e36a2538bea50bc08d33aa9499bb2" -SRC_URI[sha256sum] = "eb659b94fde6dc0a2f584c9121a5e6d39a4c8aa297d21d8f9032f7a8a775fd06" - -DEPENDS = "dbus glib-2.0 atk at-spi2-core" - -inherit autotools - -PACKAGES =+ "${PN}-gnome ${PN}-gtk2" - -FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules" -FILES_${PN}-gtk2 = "${libdir}/gtk-2.0/modules/libatk-bridge.*" -FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug" -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/5] gnome-desktop-testing: add
gnome-desktop-testing is a test runner for GNOME-style Installed Tests, and will be used by run-ptest to execute these unit test suites. Signed-off-by: Ross Burton --- .../files/no-introspection.patch| 19 +++ .../gnome-desktop-testing_2013.1.bb | 18 ++ 2 files changed, 37 insertions(+) create mode 100644 meta/recipes-support/gnome-desktop-testing/files/no-introspection.patch create mode 100644 meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2013.1.bb diff --git a/meta/recipes-support/gnome-desktop-testing/files/no-introspection.patch b/meta/recipes-support/gnome-desktop-testing/files/no-introspection.patch new file mode 100644 index 000..67b64f2 --- /dev/null +++ b/meta/recipes-support/gnome-desktop-testing/files/no-introspection.patch @@ -0,0 +1,19 @@ +Introspection is a hard requirement to build gnome-desktop-testing upstream, but +it isn't needed anymore. + +Upstream-Status: Submitted +Signed-off-by: Ross Burton + +diff --git a/configure.ac b/configure.ac +index 7460c69..6249caf 100644 +--- a/configure.ac b/configure.ac +@@ -27,8 +27,6 @@ AC_SUBST(WARN_CFLAGS) + LT_PREREQ([2.2.4]) + LT_INIT([disable-static]) + +-GOBJECT_INTROSPECTION_REQUIRE([1.34.0]) +- + PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0 >= 2.34.0]) + GIO_UNIX_CFLAGS="$GIO_UNIX_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36" + diff --git a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2013.1.bb b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2013.1.bb new file mode 100644 index 000..36e13b1 --- /dev/null +++ b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2013.1.bb @@ -0,0 +1,18 @@ +SUMMARY = "Test runner for GNOME-style installed tests" +HOMEPAGE = "https://wiki.gnome.org/GnomeGoals/InstalledTests"; +LICENSE = "LGPLv2+" + +SRC_URI = "${GNOME_MIRROR}/${BPN}/${PV}/${BPN}-${PV}.tar.xz \ + file://no-introspection.patch" +SRC_URI[md5sum] = "c6824f7bfac95bf0fcf6ed0c255979c1" +SRC_URI[sha256sum] = "632e7224de8614a8e4b7cdf87fc32551531efa9290fba0da4dae56234c584b7b" + +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ + file://src/gnome-desktop-testing-runner.c;endline=19;md5=ab86a2e00ab9cbb94f008d785004b181" + +DEPENDS = "glib-2.0" + +inherit autotools pkgconfig + +PACKAGECONFIG ??= "" +PACKAGECONFIG[journald] = "--with-systemd-journal,--without-systemd-journal,systemd,systemd" -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/5] glib-2.0: upgrade to 2.28.0
Drop the ptest patches and instead use --enable-installed-tests, updating run-ptest to invoke gnome-desktop-testing-runner. Drop the x32 build patch, upstream has integrated a similar fix. Signed-off-by: Ross Burton --- .../glib-2.0/glib-2.0/Makefile-ptest.patch | 61 -- .../glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch | 42 - meta/recipes-core/glib-2.0/glib-2.0/run-ptest |4 +- meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb | 66 meta/recipes-core/glib-2.0/glib-2.0_2.38.0.bb | 65 +++ meta/recipes-core/glib-2.0/glib.inc|9 ++- 6 files changed, 73 insertions(+), 174 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/Makefile-ptest.patch delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.38.0.bb diff --git a/meta/recipes-core/glib-2.0/glib-2.0/Makefile-ptest.patch b/meta/recipes-core/glib-2.0/glib-2.0/Makefile-ptest.patch deleted file mode 100644 index 40c5b9f..000 --- a/meta/recipes-core/glib-2.0/glib-2.0/Makefile-ptest.patch +++ /dev/null @@ -1,61 +0,0 @@ -Add 'ptest' target to Makefile, to run tests without checking dependencies. -Add 'install-ptest' target, to copy needed files to ptest dir. - -Signed-off-by: Björn Stenberg -Upstream-Status: Pending - Makefile.decl | 43 +++ - 1 file changed, 43 insertions(+) - a/Makefile.decl2012-03-12 01:42:39.0 +0100 -+++ b/Makefile.decl2012-11-26 13:42:08.436865192 +0100 -@@ -25,6 +25,49 @@ - test-nonrecursive: - endif - -+ptest: ptest-nonrecursive -+ @ for subdir in $(SUBDIRS) .; do \ -+ test -d "$$subdir" -a "$$subdir" != "." -a "$$subdir" != "po" && \ -+ ( test -d $$subdir && cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) \ -+done -+ -+ptest-nonrecursive: -+ @test -z "${TEST_PROGS}" || ${GTESTER} --keep-going --verbose ${TEST_PROGS} -+ -+install-ptest: install-ptest-nonrecursive -+ @test -z "$(SUBDIRS)" || for subdir in $(SUBDIRS); do \ -+ test "$$subdir" == "." || \ -+ (cd $$subdir && $(MAKE) DESTDIR=$(DESTDIR)/$$subdir $@ ) \ -+ done -+ -+# install files used for ptest: -+# - copy EXTRA_DIST (for test data in glib/tests) -+# - run dist-hook (for glib/tests/bookmarks/ and glib/tests/markups) -+# - copy TEST_PROGS (the test programs) -+# - copy INSTALL_PROGS (for glib/gtester) -+# - avoid libtool wrappers by copying binaries from .libs -+# - strip Makefile: target from all Makefiles -+install-ptest-nonrecursive: -+ @mkdir -p $(DESTDIR) -+ @if [ -n "${TEST_PROGS}" ]; then \ -+ if [ -n "${EXTRA_DIST}" ]; then \ -+ cp ${EXTRA_DIST} $(DESTDIR); \ -+ fi; \ -+ grep -q dist-hook: Makefile && \ -+ $(MAKE) distdir=$(DESTDIR) dist-hook; \ -+ if [ -d .libs ] ; then \ -+ cd .libs; \ -+ fi; \ -+ cp ${TEST_PROGS} $(DESTDIR); \ -+ fi; -+ @if [ -n "${INSTALL_PROGS}" ]; then \ -+ if [ -d .libs ] ; then \ -+ cd .libs; \ -+ fi; \ -+ cp ${INSTALL_PROGS} $(DESTDIR); \ -+ fi -+ @test -f Makefile && sed 's/^Makefile:/_Makefile:/' $(DESTDIR)/Makefile -+ - # test-report: run tests in subdirs and generate report - # perf-report: run tests in subdirs with -m perf and generate report - # full-report: like test-report: with -m perf and -m slow diff --git a/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch b/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch deleted file mode 100644 index 0c243cd..000 --- a/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch +++ /dev/null @@ -1,42 +0,0 @@ -Upstream-Status: Pending - -Pass CC & CFLAGS vars so that tune parameters get used. -This fixes compilation with x32 toolchain. - -Received this patch from H.J. Lu -Signed-Off-By: Nitin A Kamble 2011/07/13 - -Index: glib-2.30.0/glib/Makefile.am -=== glib-2.30.0.orig/glib/Makefile.am -+++ glib-2.30.0/glib/Makefile.am -@@ -359,10 +359,10 @@ INSTALL_PROGS= - - if ENABLE_DTRACE - glib_probes.h: glib_probes.d Makefile -- $(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp -+ $(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -C -h -s $< -o $@.tmp - @$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp - glib_probes.o: glib_probes.d Makefile -- $(AM_V_GEN) $(DTRACE) -G -s $< -o $@ -+ $(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -G -s $< -o $@ - BUILT_SOURCES += glib_probes.h glib_probes.o - CLEANFILES += glib_probes.h glib_probes.h.tmp - libglib_2_0_la_LIBADD += glib_probes.o -Index: glib-2.30.0
[OE-core] [PATCH 3/5] atk: upgrade to 2.10.0.
Signed-off-by: Ross Burton --- meta/recipes-support/atk/atk_2.10.0.bb | 23 +++ meta/recipes-support/atk/atk_2.8.0.bb | 23 --- 2 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 meta/recipes-support/atk/atk_2.10.0.bb delete mode 100644 meta/recipes-support/atk/atk_2.8.0.bb diff --git a/meta/recipes-support/atk/atk_2.10.0.bb b/meta/recipes-support/atk/atk_2.10.0.bb new file mode 100644 index 000..2e8216a --- /dev/null +++ b/meta/recipes-support/atk/atk_2.10.0.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "An accessibility toolkit for GNOME." +HOMEPAGE = "http://live.gnome.org/GAP/"; +BUGTRACKER = "https://bugzilla.gnome.org/"; +SECTION = "x11/libs" + +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ + file://atk/atkutil.c;endline=20;md5=db21b0bdbef9da4dc6eb122debc9f9bc \ + file://atk/atk.h;endline=20;md5=c58238d688c24387376d6c69d06248a7" + +DEPENDS = "glib-2.0" + +inherit gnomebase gtk-doc + +GNOME_COMPRESS_TYPE = "xz" + +SRC_URI[archive.md5sum] = "e77833d4445ebe6842e9f9a0667b0be7" +SRC_URI[archive.sha256sum] = "636917a5036bc851d8491194645d284798ec118919a828be5e713b6ecc5b50b0" + +BBCLASSEXTEND = "native" + +EXTRA_OECONF = "--disable-glibtest \ +--disable-introspection" diff --git a/meta/recipes-support/atk/atk_2.8.0.bb b/meta/recipes-support/atk/atk_2.8.0.bb deleted file mode 100644 index 9a36ae4..000 --- a/meta/recipes-support/atk/atk_2.8.0.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "An accessibility toolkit for GNOME." -HOMEPAGE = "http://live.gnome.org/GAP/"; -BUGTRACKER = "https://bugzilla.gnome.org/"; -SECTION = "x11/libs" - -LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://atk/atkutil.c;endline=20;md5=db21b0bdbef9da4dc6eb122debc9f9bc \ - file://atk/atk.h;endline=20;md5=c58238d688c24387376d6c69d06248a7" - -DEPENDS = "glib-2.0" - -inherit gnomebase gtk-doc - -GNOME_COMPRESS_TYPE = "xz" - -SRC_URI[archive.md5sum] = "c652bd25530825d604dae1c1ebd2da02" -SRC_URI[archive.sha256sum] = "b22519176226f3e07cf6d932b77852e6b6be478090704b32d0f4e0686df4" - -BBCLASSEXTEND = "native" - -EXTRA_OECONF = "--disable-glibtest \ ---disable-introspection" -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] kernel: restore scripts in the sysroot
On 13-10-07 12:18 PM, Richard Purdie wrote: On Mon, 2013-10-07 at 11:20 -0400, Bruce Ashfield wrote: I had it slightly wrong. Try: kernelheaders_sstate_postinst () { if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] then ( cd ${KERNEL_SRC_PATH}; oe_runmake scripts ) fi } since the files are actually installed at this point, therefore we operate on the final location. That's the kicker, I can't get the right variable to find the final location, KERNEL_SRC_PATH is set to /usr/src/kernel, so we can't operate on it directly. When things were runing in the sysroot_append, the kernel src was staged, and then operated on, then it makes it into the sysroot. Here, we could operate on the STAGING_KERNEL, which is in the sysroot, but stripped of the scripts. Perhaps that is the answer, but I need to confirm that scripts installed in that location would be available to the out of tree module builds that are looking for modpost and friends. Guessing again (third time lucky?), cd ${STAGING_DIR_KERNEL}; Yah, that's where it lives. I'm building now and trying to validate Khem's use case. Bruce ? Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] kernel: restore scripts in the sysroot
On Mon, 2013-10-07 at 11:20 -0400, Bruce Ashfield wrote: > I had it slightly wrong. Try: > > > > kernelheaders_sstate_postinst () { > > if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = > > "populate_sysroot_setscene" ] > > then > > ( cd ${KERNEL_SRC_PATH}; > > oe_runmake scripts > > ) > > fi > > } > > > > since the files are actually installed at this point, therefore we > > operate on the final location. > > That's the kicker, I can't get the right variable to find the final > location, KERNEL_SRC_PATH is set to /usr/src/kernel, so we can't operate > on it directly. When things were runing in the sysroot_append, the > kernel src was staged, and then operated on, then it makes it into the > sysroot. Here, we could operate on the STAGING_KERNEL, which is in the > sysroot, but stripped of the scripts. Perhaps that is the answer, but > I need to confirm that scripts installed in that location would be > available to the out of tree module builds that are looking for modpost > and friends. Guessing again (third time lucky?), cd ${STAGING_DIR_KERNEL}; ? Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] opkg-devel group (was: Re: [PATCH 08/11] opkg: Add --no-install-recommends option.)
On 7 October 2013 16:00, Andreas Oberritter wrote: > Hello Paul, > > I just tried to submit some unrelated patches, but received a DSN due to > not being subscribed to the opkg-devel group. If I understand correctly, > this would require setting up a google account first. > > Would it be possible to lower the hurdles for contribution? > I've set posting to public, we'll see how this goes. Hopefully it won't result in an increase in spam... -- Paul Barker Email: p...@paulbarker.me.uk http://www.paulbarker.me.uk ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] uboot-config.bbclass: Fix use without IMAGE_FSTYPES appending
On Mon, Oct 7, 2013 at 12:30 PM, Post Lauren-RAA013 wrote: > This works and is needed otherwise we can't set the UBOOT_CONFIG for uboot > configs that do not require an FSTYPE. Please accept this change otherwise > some of our uboot builds are broken. Thanks for confirming it worked for you. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] kernel: restore scripts in the sysroot
On 13-10-07 05:58 AM, Richard Purdie wrote: On Mon, 2013-10-07 at 01:02 -0400, Bruce Ashfield wrote: On 13-10-04 3:46 AM, Richard Purdie wrote: On Thu, 2013-10-03 at 20:02 -0400, Bruce Ashfield wrote: When building against the sysroot, out of tree modules can require modpost and other utilities normally found in the kernel's scripts directory. For the kernel source in the staging dir, these scripts have been removed to avoid mixing archiectures when packaging kernel-dev (among other things). Its also to avoid mixing architectures when packaging the sstate for do_populate_sysroot. The sstate for that task is now native arch specific after this patch but its task hash is not. Even if we made it native specific, that means the kernel would rebuild entirely if you switch 32 bit to 64 bit native machine. We therefore cannot merge this patch as is. Instead do something like: SSTATEPOSTINSTFUNCS += "kernelheaders_sstate_postinst" kernelheaders_sstate_postinst () { if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] then ( cd ${SYSROOT_DESTDIR}${KERNEL_SRC_PATH}; oe_runmake scripts ) fi } This will rerun the oe_runmake scripts each time the sstate package is installed. It slows down the use of sstate but should be correct whether the build machine is 32 or 64 bit. I poked with this a bit over the weekend, and never did get the right results. I can make the scripts trigger, but since the sysroot population appears to already be done, but build scripts don't actually make it into the sysroot for use during module builds. I tried a few variants of the below, all trying to get the actual tmp/sysroots/ to have the scripts, with no luck. Dumping the available variables didn't get me anything really promising either. I'll have another look in the morning, since I'm sure it is just me not understanding the ordering of things .. but any pointers would of course be appreciated. Cheers, Bruce STATEPOSTINSTFUNCS += "kernelscripts_sstate_postinst" kernelscripts_sstate_postinst () { if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]; then sysroot_stage_dir ${D}${KERNEL_SRC_PATH} ${SYSROOT_DESTDIR}${KERNEL_SRC_PATH} oe_runmake -C ${SYSROOT_DESTDIR}${KERNEL_SRC_PATH} scripts fi } Ah, I had it slightly wrong. Try: kernelheaders_sstate_postinst () { if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] then ( cd ${KERNEL_SRC_PATH}; oe_runmake scripts ) fi } since the files are actually installed at this point, therefore we operate on the final location. That's the kicker, I can't get the right variable to find the final location, KERNEL_SRC_PATH is set to /usr/src/kernel, so we can't operate on it directly. When things were runing in the sysroot_append, the kernel src was staged, and then operated on, then it makes it into the sysroot. Here, we could operate on the STAGING_KERNEL, which is in the sysroot, but stripped of the scripts. Perhaps that is the answer, but I need to confirm that scripts installed in that location would be available to the out of tree module builds that are looking for modpost and friends. The risk here is that when we uninstall the sstate package, we don't track the generated files. We can probably live with that for now. Agreed. What we really needs is a preinst but the one we have is really a preunpack :/. Ultimately, I think we need to rename the preinst to preunpack and add a real preinst... I'll keep digging. Cheers, Bruce Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] uboot-config.bbclass: Fix use without IMAGE_FSTYPES appending
Before checking if the image is a valid value, we need to check if the list of items is big enough or we will raise an exception. Reported-by: Lauren Post Signed-off-by: Otavio Salvador --- meta/classes/uboot-config.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes/uboot-config.bbclass b/meta/classes/uboot-config.bbclass index 09a0c0f..ba01bff 100644 --- a/meta/classes/uboot-config.bbclass +++ b/meta/classes/uboot-config.bbclass @@ -47,7 +47,8 @@ python () { bb.debug(1, "Setting UBOOT_MACHINE to %s." % items[0]) d.setVar('UBOOT_MACHINE', items[0]) -if items[1]: +# IMAGE_FSTYPES appending +if len(items) > 1 and items[1]: bb.debug(1, "Appending '%s' to IMAGE_FSTYPES." % items[1]) d.appendVar('IMAGE_FSTYPES', ' ' + items[1]) } -- 1.8.4.rc3 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] sysvinit-inittab: Fix getting tty device name from SERIAL_CONSOLES entries
From: Muhammad Shakeel Currently the part after "tty" in the device name go into label along with everything after that part. For example if SERIAL_CONSOLES="115200;vt100;ttyS0" than label=S0 but if SERIAL_CONSOLES="115200;ttyS0;vt100" than label=S0;vt100. If SERIAL_CONSOLES="..;ttyX;..", part after 'X' should also be trimmed. Signed-off-by: Muhammad Shakeel --- .../sysvinit/sysvinit-inittab_2.88dsf.bb |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb index 23c284d..05ba410 100644 --- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb @@ -22,7 +22,7 @@ do_install() { for i in $tmp do j=`echo ${i} | sed s/\;/\ /g` - label=`echo ${i} | sed -e 's/^.*;tty//'` + label=`echo ${i} | sed -e 's/^.*;tty//' -e 's/;.*//'` echo "$label:12345:respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab done -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] opkg-devel group (was: Re: [PATCH 08/11] opkg: Add --no-install-recommends option.)
Hello Paul, On 18.09.2013 17:14, Paul Barker wrote: > I'm the new maintainer for opkg, I'd be happy to look at this patch > and any others if you could send them to opkg-de...@googlegroups.com > via git send-email. I like the idea of both '--no-install-recommends' > and '--add-exclude'. I just tried to submit some unrelated patches, but received a DSN due to not being subscribed to the opkg-devel group. If I understand correctly, this would require setting up a google account first. Would it be possible to lower the hurdles for contribution? Regards, Andreas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv2 00/14] Deterministic dependencies II
On Mon, Oct 07, 2013 at 10:32:13AM +0100, Burton, Ross wrote: > On 5 October 2013 13:22, Martin Jansa wrote: > > Martin Jansa (14): > > gstreamer1.0-libav: Add PACKAGECONFIG for orc > > libunique: Add PACKAGECONFIG for dbus > > aspell: Add PACKAGECONFIG for curses > > xf86-input-synaptics: Add dependency on libxtst > > xdpyinfo: Add dependency on libxcomposite > > matchbox-wm: Add dependency on libxfixes and libxcursor > > telepathy-mission-control: Add PACKAGECONFIG for upower and > > connectivity > > tcl: Add dependency on zlib > > wget: Add dependency on libpcre > > x11vnc: Add PACKAGECONFIG for xinerama > > glib-networking: Add PACKAGECONFIG for p11-kit > > lame: Add dependency on ncurses > > subversion: Add dependency on file for libmagic > > systemd: Add PACKAGECONFIG for cryptsetup > > All looks good to me. Worth noting that the telepathy-mission-control > changes will need changing when 5.15.1 onwards is integrated, and it's > clear that matchbox-wm needs to share a .inc file. matchbox-wm and telepathy-mission-control weren't merged, should I send v3 for them? -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] qemu: fix nativesdk build without x11
Le Mon, 7 Oct 2013 12:34:02 +0100, "Burton, Ross" a écrit : > On 5 October 2013 11:11, Eric Bénard wrote: > > when x11 is not defined in DISTRO_FEATURES, there are no x11 headers > > so True is not defined leading to : > > | ui/sdl.c:62:8: warning: type defaults to 'int' in declaration of > > 'doing_grabs' [-Wimplicit-int] > > | static doing_grabs = True; > > | ^ > > | ui/sdl.c:62:22: error: 'True' undeclared here (not in a function) > > | static doing_grabs = True; > > | ^ > > Does qemu on SDL on framebuffer actually work? I'd assumed that > people using qemu without x11 were using it without SDL, so maybe this > is a bug in the build configuration for nativesdk. > I'm not using qemu in the present case, I was simply building a sdk. > A better fix would be to use 1/0 instead of True/False, I was assuming > that SDL meant X was being used. > that would also fix the problem. Eric ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] libxmu: upgrade to 1.1.2
License checksum changed as some missing copyright notices and dates were added. Signed-off-by: Ross Burton --- meta/recipes-graphics/xorg-lib/libxmu_1.1.1.bb | 34 meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb | 33 +++ 2 files changed, 33 insertions(+), 34 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libxmu_1.1.1.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb diff --git a/meta/recipes-graphics/xorg-lib/libxmu_1.1.1.bb b/meta/recipes-graphics/xorg-lib/libxmu_1.1.1.bb deleted file mode 100644 index 18ced97..000 --- a/meta/recipes-graphics/xorg-lib/libxmu_1.1.1.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Xmu and Xmuu: X Miscellaneous Utility libraries" - -DESCRIPTION = "The Xmu Library is a collection of miscellaneous (some \ -might say random) utility functions that have been useful in building \ -various applications and widgets. This library is required by the Athena \ -Widgets. A subset of the functions that do not rely on the Athena \ -Widgets (libXaw) or X Toolkit Instrinsics (libXt) are provided in a \ -second library, libXmuu." - - -require xorg-lib-common.inc - -LICENSE = "MIT & MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=15f1d981860c677503992da79140669c" - -DEPENDS += "libxt libxext" -PROVIDES = "xmu" - -PR = "r0" -PE = "1" - -XORG_PN = "libXmu" - -LEAD_SONAME = "libXmu" - -PACKAGES =+ "libxmuu libxmuu-dev" - -FILES_libxmuu = "${libdir}/libXmuu.so.*" -FILES_libxmuu-dev = "${libdir}/libXmuu.so" - -BBCLASSEXTEND = "native" - -SRC_URI[md5sum] = "a4efff8de85bd45dd3da124285d10c00" -SRC_URI[sha256sum] = "709081c550cc3a866d7c760a3f97384a1fe16e27fc38fe8169b8db9f33aa7edd" diff --git a/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb b/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb new file mode 100644 index 000..3922b52 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb @@ -0,0 +1,33 @@ +SUMMARY = "Xmu and Xmuu: X Miscellaneous Utility libraries" + +DESCRIPTION = "The Xmu Library is a collection of miscellaneous (some \ +might say random) utility functions that have been useful in building \ +various applications and widgets. This library is required by the Athena \ +Widgets. A subset of the functions that do not rely on the Athena \ +Widgets (libXaw) or X Toolkit Instrinsics (libXt) are provided in a \ +second library, libXmuu." + + +require xorg-lib-common.inc + +LICENSE = "MIT & MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=def3d8e4e9c42004f1941fa22f01dc18" + +DEPENDS += "libxt libxext" +PROVIDES = "xmu" + +PE = "1" + +XORG_PN = "libXmu" + +LEAD_SONAME = "libXmu" + +PACKAGES =+ "libxmuu libxmuu-dev" + +FILES_libxmuu = "${libdir}/libXmuu.so.*" +FILES_libxmuu-dev = "${libdir}/libXmuu.so" + +BBCLASSEXTEND = "native" + +SRC_URI[md5sum] = "41d92ab627dfa06568076043f3e089e4" +SRC_URI[sha256sum] = "756edc7c383254eef8b4e1b733c3bf1dc061b523c9f9833ac7058378b8349d0b" -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] libxpm: upgrade to 3.5.11
License checksum changed as a typo was fixed upstream. Signed-off-by: Ross Burton --- meta/recipes-graphics/xorg-lib/libxpm_3.5.10.bb | 28 --- meta/recipes-graphics/xorg-lib/libxpm_3.5.11.bb | 27 ++ 2 files changed, 27 insertions(+), 28 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libxpm_3.5.10.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxpm_3.5.11.bb diff --git a/meta/recipes-graphics/xorg-lib/libxpm_3.5.10.bb b/meta/recipes-graphics/xorg-lib/libxpm_3.5.10.bb deleted file mode 100644 index 17b1ef5..000 --- a/meta/recipes-graphics/xorg-lib/libxpm_3.5.10.bb +++ /dev/null @@ -1,28 +0,0 @@ -require xorg-lib-common.inc - -# libxpm requires xgettext to build -inherit gettext - -SUMMARY = "Xpm: X Pixmap extension library" - -DESCRIPTION = "libXpm provides support and common operation for the XPM \ -pixmap format, which is commonly used in legacy X applications. XPM is \ -an extension of the monochrome XBM bitmap specificied in the X \ -protocol." - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=3e07763d16963c3af12db271a31abaa5" -DEPENDS += "libxext libsm libxt" -PR = "r0" -PE = "1" - -XORG_PN = "libXpm" - -PACKAGES =+ "sxpm cxpm" -FILES_cxpm = "${bindir}/cxpm" -FILES_sxpm = "${bindir}/sxpm" - -SRC_URI[md5sum] = "7ae7eff7a14d411e84a67bd166bcec1a" -SRC_URI[sha256sum] = "a6db7e234750e7d60330017972e31d8e1f29f0a8c1391e4ac82f6102d919a735" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-graphics/xorg-lib/libxpm_3.5.11.bb b/meta/recipes-graphics/xorg-lib/libxpm_3.5.11.bb new file mode 100644 index 000..545874c --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxpm_3.5.11.bb @@ -0,0 +1,27 @@ +require xorg-lib-common.inc + +# libxpm requires xgettext to build +inherit gettext + +SUMMARY = "Xpm: X Pixmap extension library" + +DESCRIPTION = "libXpm provides support and common operation for the XPM \ +pixmap format, which is commonly used in legacy X applications. XPM is \ +an extension of the monochrome XBM bitmap specificied in the X \ +protocol." + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=51f4270b012ecd4ab1a164f5f4ed6cf7" +DEPENDS += "libxext libsm libxt" +PE = "1" + +XORG_PN = "libXpm" + +PACKAGES =+ "sxpm cxpm" +FILES_cxpm = "${bindir}/cxpm" +FILES_sxpm = "${bindir}/sxpm" + +SRC_URI[md5sum] = "769ee12a43611cdebd38094eaf83f3f0" +SRC_URI[sha256sum] = "c5bdafa51d1ae30086fac01ab83be8d47fe117b238d3437f8e965434090e041c" + +BBCLASSEXTEND = "native" -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] xf86-video-vesa: upgrade to 2.3.3
Drop Remove-mibstore.h.patch as that was a backport from git and is integrated into 2.3.3. Signed-off-by: Ross Burton --- .../xf86-video-vesa/Remove-mibstore.h.patch| 37 .../xorg-driver/xf86-video-vesa_2.3.2.bb | 23 .../xorg-driver/xf86-video-vesa_2.3.3.bb | 21 +++ 3 files changed, 21 insertions(+), 60 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vesa/Remove-mibstore.h.patch delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.2.bb create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa/Remove-mibstore.h.patch b/meta/recipes-graphics/xorg-driver/xf86-video-vesa/Remove-mibstore.h.patch deleted file mode 100644 index 0805d81..000 --- a/meta/recipes-graphics/xorg-driver/xf86-video-vesa/Remove-mibstore.h.patch +++ /dev/null @@ -1,37 +0,0 @@ -Upstream-Status: Backported - -From 60d2dc115c4b6210d3b1e05f5b0c39d1f7917cbc Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 25 Sep 2012 08:55:03 -0400 -Subject: [PATCH] Remove mibstore.h - -Signed-off-by: Adam Jackson - src/vesa.c |4 - 1 file changed, 4 deletions(-) - -diff --git a/src/vesa.c b/src/vesa.c -index 11cd26c..b73d104 100644 a/src/vesa.c -+++ b/src/vesa.c -@@ -49,9 +49,6 @@ - /* All drivers initialising the SW cursor need this */ - #include "mipointer.h" - --/* All drivers implementing backing store need this */ --#include "mibstore.h" -- - /* Colormap handling */ - #include "micmap.h" - #include "xf86cmap.h" -@@ -1081,7 +1078,6 @@ VESAScreenInit(SCREEN_INIT_ARGS_DECL) - VESADGAInit(pScrn, pScreen); - - xf86SetBlackWhitePixels(pScreen); --miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - - /* software cursor */ --- -1.7.9.5 - diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.2.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.2.bb deleted file mode 100644 index 4ec07a0..000 --- a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.2.bb +++ /dev/null @@ -1,23 +0,0 @@ -require xorg-driver-video.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=a1f0610ebdc6f314a9fa5102a8c5c1b0" - -SUMMARY = "X.Org X server -- Generic Vesa video driver" - -DESCRIPTION = "vesa is an Xorg driver for generic VESA video cards. It \ -can drive most VESA-compatible video cards, but only makes use of the \ -basic standard VESA core that is common to these cards. The driver \ -supports depths 8, 15 16 and 24." - -PR = "${INC_PR}.0" - -DEPENDS += "virtual/libx11 randrproto libpciaccess" - -COMPATIBLE_HOST = '(i.86|x86_64).*-linux' - -RRECOMMENDS_${PN} += "xserver-xorg-module-libint10" - -SRC_URI += "file://Remove-mibstore.h.patch" - -SRC_URI[md5sum] = "3eddd393fba79550e012d717499d58ad" -SRC_URI[sha256sum] = "144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3" diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb new file mode 100644 index 000..4052f70 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb @@ -0,0 +1,21 @@ +require xorg-driver-video.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=a1f0610ebdc6f314a9fa5102a8c5c1b0" + +SUMMARY = "X.Org X server -- Generic Vesa video driver" + +DESCRIPTION = "vesa is an Xorg driver for generic VESA video cards. It \ +can drive most VESA-compatible video cards, but only makes use of the \ +basic standard VESA core that is common to these cards. The driver \ +supports depths 8, 15 16 and 24." + +PR = "${INC_PR}.0" + +DEPENDS += "virtual/libx11 randrproto libpciaccess" + +COMPATIBLE_HOST = '(i.86|x86_64).*-linux' + +RRECOMMENDS_${PN} += "xserver-xorg-module-libint10" + +SRC_URI[md5sum] = "3690a5356ed121b1a7dfb59a6dcf4bf9" +SRC_URI[sha256sum] = "ce8b75e5a40e9dae76f2ac9e2880f7f73a848653ca2eed5880f52dc2c0d3aef8" -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] libsm: upgrade to 1.2.2
Signed-off-by: Ross Burton --- meta/recipes-graphics/xorg-lib/libsm_1.2.1.bb | 24 meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb | 23 +++ 2 files changed, 23 insertions(+), 24 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libsm_1.2.1.bb create mode 100644 meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb diff --git a/meta/recipes-graphics/xorg-lib/libsm_1.2.1.bb b/meta/recipes-graphics/xorg-lib/libsm_1.2.1.bb deleted file mode 100644 index 1613bb9..000 --- a/meta/recipes-graphics/xorg-lib/libsm_1.2.1.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "SM: Session Management library" - -DESCRIPTION = "The Session Management Library (SMlib) is a low-level \"C\" \ -language interface to XSMP. The purpose of the X Session Management \ -Protocol (XSMP) is to provide a uniform mechanism for users to save and \ -restore their sessions. A session is a group of clients, each of which \ -has a particular state." - -require xorg-lib-common.inc - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb37f44e02bdbde80546024400728d" - -DEPENDS += "libice xproto xtrans e2fsprogs" - -PR = "r0" -PE = "1" - -XORG_PN = "libSM" - -BBCLASSEXTEND = "native" - -SRC_URI[md5sum] = "766de9d1e1ecf8bf74cebe2111d8e2bd" -SRC_URI[sha256sum] = "93c11d569c64f40723b93b44af1efb474a0cfe92573b0c8c330343cabb897f1d" diff --git a/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb b/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb new file mode 100644 index 000..180acfa --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb @@ -0,0 +1,23 @@ +SUMMARY = "SM: Session Management library" + +DESCRIPTION = "The Session Management Library (SMlib) is a low-level \"C\" \ +language interface to XSMP. The purpose of the X Session Management \ +Protocol (XSMP) is to provide a uniform mechanism for users to save and \ +restore their sessions. A session is a group of clients, each of which \ +has a particular state." + +require xorg-lib-common.inc + +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb37f44e02bdbde80546024400728d" + +DEPENDS += "libice xproto xtrans e2fsprogs" + +PE = "1" + +XORG_PN = "libSM" + +BBCLASSEXTEND = "native" + +SRC_URI[md5sum] = "499a7773c65aba513609fe651853c5f3" +SRC_URI[sha256sum] = "0baca8c9f5d934450a70896c4ad38d06475521255ca63b717a6510fdb6e287bd" -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] qemu: fix nativesdk build without x11
On 5 October 2013 11:11, Eric Bénard wrote: > when x11 is not defined in DISTRO_FEATURES, there are no x11 headers > so True is not defined leading to : > | ui/sdl.c:62:8: warning: type defaults to 'int' in declaration of > 'doing_grabs' [-Wimplicit-int] > | static doing_grabs = True; > | ^ > | ui/sdl.c:62:22: error: 'True' undeclared here (not in a function) > | static doing_grabs = True; > | ^ Does qemu on SDL on framebuffer actually work? I'd assumed that people using qemu without x11 were using it without SDL, so maybe this is a bug in the build configuration for nativesdk. A better fix would be to use 1/0 instead of True/False, I was assuming that SDL meant X was being used. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] kernel: restore scripts in the sysroot
On Mon, 2013-10-07 at 01:02 -0400, Bruce Ashfield wrote: > On 13-10-04 3:46 AM, Richard Purdie wrote: > > On Thu, 2013-10-03 at 20:02 -0400, Bruce Ashfield wrote: > >> When building against the sysroot, out of tree modules can require modpost > >> and other utilities normally found in the kernel's scripts directory. For > >> the kernel source in the staging dir, these scripts have been removed to > >> avoid mixing archiectures when packaging kernel-dev (among other things). > > > > Its also to avoid mixing architectures when packaging the sstate for > > do_populate_sysroot. The sstate for that task is now native arch > > specific after this patch but its task hash is not. Even if we made it > > native specific, that means the kernel would rebuild entirely if you > > switch 32 bit to 64 bit native machine. We therefore cannot merge this > > patch as is. > > > > Instead do something like: > > > > > > SSTATEPOSTINSTFUNCS += "kernelheaders_sstate_postinst" > > > > kernelheaders_sstate_postinst () { > > if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = > > "populate_sysroot_setscene" ] > > then > > ( cd ${SYSROOT_DESTDIR}${KERNEL_SRC_PATH}; > > oe_runmake scripts > > ) > > fi > > } > > > > This will rerun the oe_runmake scripts each time the sstate package is > > installed. It slows down the use of sstate but should be correct whether > > the build machine is 32 or 64 bit. > > I poked with this a bit over the weekend, and never did get the right > results. > > I can make the scripts trigger, but since the sysroot population appears > to already be done, but build scripts don't actually make it into the > sysroot for use during module builds. > > I tried a few variants of the below, all trying to get the actual > tmp/sysroots/ to have the scripts, with no luck. Dumping the > available variables didn't get me anything really promising either. > > I'll have another look in the morning, since I'm sure it is just me not > understanding the ordering of things .. but any pointers would of course > be appreciated. > > Cheers, > > Bruce > > STATEPOSTINSTFUNCS += "kernelscripts_sstate_postinst" > kernelscripts_sstate_postinst () { > if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o > "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]; then > sysroot_stage_dir ${D}${KERNEL_SRC_PATH} > ${SYSROOT_DESTDIR}${KERNEL_SRC_PATH} > oe_runmake -C ${SYSROOT_DESTDIR}${KERNEL_SRC_PATH} scripts > fi > } > Ah, I had it slightly wrong. Try: kernelheaders_sstate_postinst () { if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] then ( cd ${KERNEL_SRC_PATH}; oe_runmake scripts ) fi } since the files are actually installed at this point, therefore we operate on the final location. The risk here is that when we uninstall the sstate package, we don't track the generated files. We can probably live with that for now. What we really needs is a preinst but the one we have is really a preunpack :/. Ultimately, I think we need to rename the preinst to preunpack and add a real preinst... Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv2 00/14] Deterministic dependencies II
On 5 October 2013 13:22, Martin Jansa wrote: > Martin Jansa (14): > gstreamer1.0-libav: Add PACKAGECONFIG for orc > libunique: Add PACKAGECONFIG for dbus > aspell: Add PACKAGECONFIG for curses > xf86-input-synaptics: Add dependency on libxtst > xdpyinfo: Add dependency on libxcomposite > matchbox-wm: Add dependency on libxfixes and libxcursor > telepathy-mission-control: Add PACKAGECONFIG for upower and > connectivity > tcl: Add dependency on zlib > wget: Add dependency on libpcre > x11vnc: Add PACKAGECONFIG for xinerama > glib-networking: Add PACKAGECONFIG for p11-kit > lame: Add dependency on ncurses > subversion: Add dependency on file for libmagic > systemd: Add PACKAGECONFIG for cryptsetup All looks good to me. Worth noting that the telepathy-mission-control changes will need changing when 5.15.1 onwards is integrated, and it's clear that matchbox-wm needs to share a .inc file. Signed-off-by: Ross Burton Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core