From 59e6934e7ce614ac92426407493b2d8999457db6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 28 Aug 2012 06:25:43 +0000 Subject: [PATCH 1/7] orc: update to 0.4.16 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Koen Kooi Signed-off-by: Eric Bénard --- meta-oe/recipes-devtools/orc/orc_0.4.14.bb | 6 ------ meta-oe/recipes-devtools/orc/orc_0.4.16.bb | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 meta-oe/recipes-devtools/orc/orc_0.4.14.bb create mode 100644 meta-oe/recipes-devtools/orc/orc_0.4.16.bb diff --git a/meta-oe/recipes-devtools/orc/orc_0.4.14.bb b/meta-oe/recipes-devtools/orc/orc_0.4.14.bb deleted file mode 100644 index 639fd4fb0e..0000000000 --- a/meta-oe/recipes-devtools/orc/orc_0.4.14.bb +++ /dev/null @@ -1,6 +0,0 @@ -require orc.inc - -PR = "${INC_PR}.0" - -SRC_URI[orc.md5sum] = "6b3ff209e9763ebe40e152538884bd71" -SRC_URI[orc.sha256sum] = "6b0c536984871954364976516ea0328e2dcd856111726a23e609504ba2b12313" diff --git a/meta-oe/recipes-devtools/orc/orc_0.4.16.bb b/meta-oe/recipes-devtools/orc/orc_0.4.16.bb new file mode 100644 index 0000000000..bb193ab6c7 --- /dev/null +++ b/meta-oe/recipes-devtools/orc/orc_0.4.16.bb @@ -0,0 +1,6 @@ +require orc.inc + +PR = "${INC_PR}.0" + +SRC_URI[orc.md5sum] = "e482932e544c847761449b106ecbc483" +SRC_URI[orc.sha256sum] = "700e4edba20a0ed42164b645da26ce515b883d4c4633b222302f1e541f2a58ab" From 7d2a48a8e028be1f9584f267bed9a39bb8ec0667 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 28 Aug 2012 06:25:44 +0000 Subject: [PATCH 2/7] nodejs: update to 0.6.20 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Koen Kooi Signed-off-by: Eric Bénard --- .../nodejs/{nodejs_0.6.18.bb => nodejs_0.6.20.bb} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename meta-oe/recipes-devtools/nodejs/{nodejs_0.6.18.bb => nodejs_0.6.20.bb} (92%) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_0.6.18.bb b/meta-oe/recipes-devtools/nodejs/nodejs_0.6.20.bb similarity index 92% rename from meta-oe/recipes-devtools/nodejs/nodejs_0.6.18.bb rename to meta-oe/recipes-devtools/nodejs/nodejs_0.6.20.bb index 7136ffc6a0..77ed388d35 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_0.6.18.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_0.6.20.bb @@ -7,9 +7,8 @@ DEPENDS = "openssl" SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz \ file://fix-hardfloat-detection.patch" - -SRC_URI[md5sum] = "4a3d3123ccc7b9b21c1990fe074e3d14" -SRC_URI[sha256sum] = "6cf4311ecbc1700e88f4382a31b3a7017c1572cd641fd06e653fc1692c2cffff" +SRC_URI[md5sum] = "fcf8e0f2981f9dd66606a2162a2df55d" +SRC_URI[sha256sum] = "b7bf4cf143ddf46ba5e975761b98a38dd3d72b176fd5d4bb2f9c9e7bbe6c4b15" S = "${WORKDIR}/node-v${PV}" From 8374a0caf3c86d3cbff19861f27e23d8fd6b970a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 28 Aug 2012 06:25:45 +0000 Subject: [PATCH 3/7] systemd.bbclass: remove unused code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller Signed-off-by: Koen Kooi Signed-off-by: Eric Bénard --- meta-oe/classes/systemd.bbclass | 5 ----- 1 file changed, 5 deletions(-) diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass index db35717f63..2881abff66 100644 --- a/meta-oe/classes/systemd.bbclass +++ b/meta-oe/classes/systemd.bbclass @@ -54,11 +54,6 @@ def systemd_after_parse(d): "\n\n%s: %s in SYSTEMD_PACKAGES does not match -systemd or ${PN} (deprecated)" % \ ( bb_filename, pkg_systemd) - # check SYSTEMD_SERVICE - for pkg_systemd in systemd_pkgs.split(): - service_pkg = 'SYSTEMD_SERVICE' + "_" + pkg_systemd - systemd_services = d.getVar(service_pkg, 1) or d.getVar('SYSTEMD_SERVICE', 1) or "" - # prepend systemd-packages not already included def systemd_create_package(pkg_systemd): packages = d.getVar('PACKAGES', 1) From 8e0c96b9abd568a942165d60edbf23971d552ac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 28 Aug 2012 06:25:46 +0000 Subject: [PATCH 4/7] systemd.bbclass: extract SYSTEMD_SERVICE properly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To set service files the following syntax is allowed: SYSTEMD_SERVICE = or SYSTEMD_SERVICE_{} = A function get_package_var was introduced to handle all use-cases [1] properly. Build tested / buildhistory checks [1] http://lists.linuxtogo.org/pipermail/openembedded-devel/2012-May/039870.html Signed-off-by: Andreas Müller Acked-by: Martin Jansa Signed-off-by: Koen Kooi Signed-off-by: Eric Bénard --- meta-oe/classes/systemd.bbclass | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass index 2881abff66..2e585c3eca 100644 --- a/meta-oe/classes/systemd.bbclass +++ b/meta-oe/classes/systemd.bbclass @@ -24,6 +24,12 @@ systemd_postrm() { systemctl disable ${SYSTEMD_SERVICE} } +def get_package_var(d, var, pkg): + val = (d.getVar('%s_%s' % (var, pkg), d, 1) or "").strip() + if val == "": + val = (d.getVar(var, d, 1) or "").strip() + return val + def systemd_after_parse(d): def systemd_check_vars(): if d.getVar('BB_WORKERCONTEXT', True) is not None: @@ -155,8 +161,7 @@ python populate_packages_prepend () { systemd_packages = d.getVar('SYSTEMD_PACKAGES', 1) has_exactly_one_service = len(systemd_packages.split()) == 1 if has_exactly_one_service: - systemd_services = d.getVar('SYSTEMD_SERVICE' + "_" + systemd_packages, 1) or d.getVar('SYSTEMD_SERVICE', 1) - has_exactly_one_service = len(systemd_services.split()) == 1 + has_exactly_one_service = len(get_package_var(d, 'SYSTEMD_SERVICE', systemd_packages).split()) == 1 keys = 'Also' # Conflicts?? if has_exactly_one_service: @@ -164,8 +169,7 @@ python populate_packages_prepend () { keys = 'Also Conflicts' # scan for all in SYSTEMD_SERVICE[] for pkg_systemd in systemd_packages.split(): - systemd_services = d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1) or d.getVar('SYSTEMD_SERVICE', 1) - for service in systemd_services.split(): + for service in get_package_var(d, 'SYSTEMD_SERVICE', pkg_systemd).split(): path_found = '' for path in searchpaths.split(): if os.path.exists('${D}' + path + service): @@ -196,7 +200,7 @@ python populate_packages_prepend () { # run all modifications once when creating package if os.path.exists('${D}'): for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split(): - if d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1) and d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1).strip(): + if get_package_var(d, 'SYSTEMD_SERVICE', pkg_systemd) != "": systemd_generate_package_scripts(pkg_systemd) systemd_add_rdepends(pkg_systemd) systemd_check_services() From 577943f85154be553b8133b3f2a13f53892152c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 28 Aug 2012 06:25:47 +0000 Subject: [PATCH 5/7] systemd.bbclass: do not warn for systemd files are in ${PN} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since we have our own layer there is no need to separate out systemd packages Signed-off-by: Eric Bénard --- meta-oe/classes/systemd.bbclass | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass index 2e585c3eca..babe15e315 100644 --- a/meta-oe/classes/systemd.bbclass +++ b/meta-oe/classes/systemd.bbclass @@ -46,18 +46,13 @@ def systemd_after_parse(d): if pkg_systemd.find("-systemd") == -1: if pkg_systemd != d.getVar('PN', 1): raise bb.build.FuncFailed, \ - "\n\n%s: %s in SYSTEMD_PACKAGES does not match -systemd or ${PN} (deprecated)" % \ + "\n\n%s: %s in SYSTEMD_PACKAGES does not match -systemd or ${PN}" % \ (bb_filename, pkg_systemd) - else: - # Only complain if recipe lacks native systemd support - native_systemd_support = d.getVar('NATIVE_SYSTEMD_SUPPORT', 1) or "" - if native_systemd_support == "": - bb.warn("%s: it is recommended to set SYSTEMD_PACKAGES as -systemd" % bb_filename) else: pkg_systemd_base = pkg_systemd.replace('-systemd', '') if pkg_systemd_base not in packages: raise bb.build.FuncFailed, \ - "\n\n%s: %s in SYSTEMD_PACKAGES does not match -systemd or ${PN} (deprecated)" % \ + "\n\n%s: %s in SYSTEMD_PACKAGES does not match -systemd or ${PN}" % \ ( bb_filename, pkg_systemd) # prepend systemd-packages not already included From 59c995359502910da4dd60fb53130c84b23d96e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 28 Aug 2012 06:25:48 +0000 Subject: [PATCH 6/7] systemd.bbclass: introduce SYSTEMD_AUTO_ENABLE variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently all services introduced are enabled and started at installation. By setting SYSTEMD_AUTO_ENABLE = "disable" the default behaviour can be overridden. Signed-off-by: Eric Bénard --- meta-oe/classes/systemd.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass index babe15e315..a2c8ddf0ec 100644 --- a/meta-oe/classes/systemd.bbclass +++ b/meta-oe/classes/systemd.bbclass @@ -1,5 +1,7 @@ DEPENDS_append = " systemd-systemctl-native" +SYSTEMD_AUTO_ENABLE ??= "enable" + systemd_postinst() { OPTS="" @@ -7,9 +9,9 @@ if [ -n "$D" ]; then OPTS="--root=$D" fi -systemctl $OPTS enable ${SYSTEMD_SERVICE} +systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} ${SYSTEMD_SERVICE} -if [ -z "$D" ]; then +if [ -z "$D" -a ${SYSTEMD_AUTO_ENABLE} = "enable" ]; then systemctl start ${SYSTEMD_SERVICE} fi } From 653f2f616949474b3eb31d17937137cf26139440 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 28 Aug 2012 06:25:49 +0000 Subject: [PATCH 7/7] sox: add 14.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Koen Kooi Signed-off-by: Eric Bénard --- .../recipes-multimedia/sox/sox_14.4.0.bb | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb diff --git a/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb b/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb new file mode 100644 index 0000000000..f7ec1eeae9 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb @@ -0,0 +1,26 @@ +DESCRIPTION="SoX is the Swiss Army knife of sound processing tools. \ +It converts audio files among various standard audio file formats \ +and can apply different effects and filters to the audio data." +HOMEPAGE = "http://sox.sourceforge.net" +SECTION = "audio" + +DEPENDS = "libpng libav libsndfile1" + +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ + " +PACKAGECONFIG[pulseaudio] = "--with-pulseaudio=dyn,--with-pulseaudio=no,pulseaudio," +PACKAGECONFIG[alsa] = "--with-alsa=dyn,--with-alsa=no,alsa-lib," + +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe \ + file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24" + +SRC_URI = "${SOURCEFORGE_MIRROR}/sox/sox-${PV}.tar.gz" +SRC_URI[md5sum] = "b0c15cff7a4ba0ec17fdc74e6a1f9cf1" +SRC_URI[sha256sum] = "3ee34b14dd267de378e8a117aae81ec4cae330772342e6a55bbf6520a0a88aa3" + +inherit autotools + +BBCLASSEXTEND = "native" +