Pending patches from O.S. Systems' tree
cover Pending patches from O.S. Systems' tree
The following changes since commit d248ea6ada38ba9070f45f4fd2ab107bc6ed0246:
libedit: Remove files folder as no patch was being used (2012-03-31 16:48:43 +0200)
are available in the git repository at:
git://github.com/OSSystems/meta-oe master
https://github.com/OSSystems/meta-oe/tree/master
Otavio Salvador (3):
xbitmaps: add 1.1.1 version
openmotif: add 2.3.3
systemd-systemctl-native: add support to disable services
.../systemd/systemd-systemctl-native.bb | 2 +- .../systemd/systemd-systemctl-native/systemctl | 32 +++++++++++++---- .../recipes-graphics/xorg-data/xbitmaps_1.1.1.bb | 10 +++++ .../xorg-data/xorg-data-common.inc | 10 +++++ .../openmotif/openmotif/configure.patch | 15 ++++++++ .../recipes-support/openmotif/openmotif_2.3.3.bb | 38 ++++++++++++++++++++ 6 files changed, 99 insertions(+), 8 deletions(-) create mode 100644 meta-oe/recipes-graphics/xorg-data/xbitmaps_1.1.1.bb create mode 100644 meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc create mode 100644 meta-oe/recipes-support/openmotif/openmotif/configure.patch create mode 100644 meta-oe/recipes-support/openmotif/openmotif_2.3.3.bb
Signature · 1 line
1.7.2.5
PATCH 1/3 xbitmaps: add 1.1.1 version
Signed-off-by Otavio Salvador <[email protected]>
--- .../recipes-graphics/xorg-data/xbitmaps_1.1.1.bb | 10 ++++++++++ .../xorg-data/xorg-data-common.inc | 10 ++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-graphics/xorg-data/xbitmaps_1.1.1.bb create mode 100644 meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc
meta-oe/recipes-graphics/xorg-data/xbitmaps_1.1.1.bb new file +10 -0
@@ -0,0 +1,10 @@ +require xorg-data-common.inc + +DESCRIPTION = "Common X11 Bitmaps" +LICENSE = "MIT" +DEPENDS += "libxmu" + +LIC_FILES_CHKSUM = "file://COPYING;md5=dbd075aaffa4a60a8d00696f2e4b9a8f" + +SRC_URI[md5sum] = "7444bbbd999b53bec6a60608a5301f4c" +SRC_URI[sha256sum] = "3671b034356bbc4d32d052808cf646c940ec8b2d1913adac51b1453e41aa1e9d"
meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc new file +10 -0
@@ -0,0 +1,10 @@ +HOMEPAGE = "http://www.x.org" +SECTION = "x11/data" +LICENSE = "MIT-X" + +XORG_PN = "${PN}" + +SRC_URI = "${XORG_MIRROR}/individual/data/${XORG_PN}-${PV}.tar.bz2" +S = "${WORKDIR}/${XORG_PN}-${PV}" + +inherit autotools pkgconfig
Signature · 1 line
1.7.2.5
PATCH 2/3 openmotif: add 2.3.3
In reply to Otavio SalvadorSigned-off-by Otavio Salvador <[email protected]>
--- .../openmotif/openmotif/configure.patch | 15 ++++++++ .../recipes-support/openmotif/openmotif_2.3.3.bb | 38 ++++++++++++++++++++ 2 files changed, 53 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-support/openmotif/openmotif/configure.patch create mode 100644 meta-oe/recipes-support/openmotif/openmotif_2.3.3.bb
meta-oe/recipes-support/openmotif/openmotif/configure.patch new file +15 -0
@@ -0,0 +1,15 @@ +--- a/configure.ac~ 2009-10-27 14:10:23.000000000 -0200 ++++ b/configure.ac 2011-05-31 10:51:00.207232036 -0300 +@@ -3,12 +3,6 @@ + AC_CONFIG_SRCDIR([lib/Xm/Form.c]) + AC_PREREQ(2.52) + AC_CONFIG_AUX_DIR(.) +-AC_CHECK_FILE(/usr/X/include/X11/X.h, +- AC_PREFIX_DEFAULT(/usr/X), +- AC_PREFIX_DEFAULT(/usr)) +-AC_CHECK_FILE(/usr/X11R6/include/X11/X.h, +- AC_PREFIX_DEFAULT(/usr/X11R6), +- AC_PREFIX_DEFAULT(/usr)) + + dnl AM_MAINTAINER_MODE + AC_CANONICAL_TARGET
meta-oe/recipes-support/openmotif/openmotif_2.3.3.bb new file +38 -0
@@ -0,0 +1,38 @@ +SECTION = "libs" +DESCRIPTION = "OSM/Motif implementation." +LICENSE = "OGPL" +DEPENDS = "xbitmaps virtual/libx11 libxt libxp" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=14f692c82491db3d52419929d2f3b343" + +SRC_URI = "http://openmotif.com/files/public_downloads/openmotif/2.3/2.3.3/openmotif-2.3.3.tar.gz \ + file://configure.patch;patch=1" + +SRC_URI[md5sum] = "fd27cd3369d6c7d5ef79eccba524f7be" +SRC_URI[sha256sum] = "c85f5545e218fa0c59a3789192132d472fc5a33e914a221a568eee4fc10cd103" + +inherit autotools + +PACKAGES += "${PN}-bin" + +FILES_${PN}-bin = "${bindir}" + +do_compile() { + ( + # HACK: build a native binaries need during the build + unset CC LD CXX CCLD CFLAGS + oe_runmake -C config/util CC="${BUILD_CC}" LD="${BUILD_LD}" CXX="${BUILD_CXX}" LIBS="" makestrs + ) + if [ "$?" != "0" ]; then + exit 1 + fi + oe_runmake -C lib + oe_runmake -C include +} + +do_install() { + oe_runmake DESTDIR=${D} -C lib install + oe_runmake DESTDIR=${D} -C include install +} + +LEAD_SONAME = "libXm.so.4"
Signature · 1 line
1.7.2.5
PATCH 3/3 systemd-systemctl-native: add support to disable services
In reply to Otavio SalvadorThis adds support to disable services making possible to it to be done during rootfs generation.
Signed-off-by Otavio Salvador <[email protected]>
--- .../systemd/systemd-systemctl-native.bb | 2 +- .../systemd/systemd-systemctl-native/systemctl | 32 +++++++++++++++---- 2 files changed, 26 insertions(+), 8 deletions(-)
meta-oe/recipes-core/systemd/systemd-systemctl-native.bb +1 -1
@@ -3,7 +3,7 @@ DESCRIPTION = "Wrapper to enable of systemd services" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" -PR = "r1" +PR = "r2" inherit native
meta-oe/recipes-core/systemd/systemd-systemctl-native/systemctl +25 -7
@@ -3,6 +3,7 @@ ROOT= # parse command line params +action= while [ $# != 0 ]; do opt="$1"
@@ -10,17 +11,26 @@ while [ $# != 0 ]; do enable) shift + action="$opt" services="$1" - in_enable="1" + cmd_args="1" + shift + ;; + disable) + shift + + action="$opt" + services="$1" + cmd_args="1" shift ;; --root=*) ROOT=${opt##--root=} - in_enable="0" + cmd_args="0" shift ;; *) - if [ "$in_enable" = "1" ]; then + if [ "$cmd_args" = "1" ]; then services="$services $opt" shift else
@@ -53,9 +63,15 @@ for service in $services; do | grep '\.target$') for r in $wanted_by; do - mkdir -p $ROOT/etc/systemd/system/$r.wants - ln -s $service_file $ROOT/etc/systemd/system/$r.wants - echo "Enabled $service for $wanted_by." + if [ "$action" = "enable" ]; then + mkdir -p $ROOT/etc/systemd/system/$r.wants + ln -s $service_file $ROOT/etc/systemd/system/$r.wants + echo "Enabled $service for $wanted_by." + else + rm -f $ROOT/etc/systemd/system/$r.wants/$service_file + rmdirs -p $ROOT/etc/systemd/system/$r.wants + echo "Disabled $service for $wanted_by." + fi done # call us for the other required scripts
@@ -63,6 +79,8 @@ for service in $services; do | sed 's,Also=,,g' \ | tr ',' '\n') for a in $also; do - $0 --root=$ROOT enable $a + if [ "$action" = "enable" ]; then + $0 --root=$ROOT enable $a + fi done done
Signature · 1 line
1.7.2.5