diff options
author | Eric Bénard <eric@eukrea.com> | 2012-09-02 15:04:25 +0200 |
---|---|---|
committer | Eric Bénard <eric@eukrea.com> | 2012-09-02 15:04:25 +0200 |
commit | d35e9e1144a52b0056655d179f1a0421473bc5dd (patch) | |
tree | 640088ae439d29acd089bf2458f01f2a406b6295 | |
parent | 6e434777018b81bbd7873e7278f05425de18558a (diff) | |
parent | 653f2f616949474b3eb31d17937137cf26139440 (diff) | |
download | meta-openembedded-d35e9e1144a52b0056655d179f1a0421473bc5dd.tar.gz |
Merge branch 'denzil-next' into denzil
-rw-r--r-- | meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb | 26 | ||||
-rw-r--r-- | meta-oe/classes/systemd.bbclass | 34 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs_0.6.20.bb (renamed from meta-oe/recipes-devtools/nodejs/nodejs_0.6.18.bb) | 5 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/orc/orc_0.4.14.bb | 6 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/orc/orc_0.4.16.bb | 6 |
5 files changed, 49 insertions, 28 deletions
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 000000000..f7ec1eeae --- /dev/null +++ b/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb | |||
@@ -0,0 +1,26 @@ | |||
1 | DESCRIPTION="SoX is the Swiss Army knife of sound processing tools. \ | ||
2 | It converts audio files among various standard audio file formats \ | ||
3 | and can apply different effects and filters to the audio data." | ||
4 | HOMEPAGE = "http://sox.sourceforge.net" | ||
5 | SECTION = "audio" | ||
6 | |||
7 | DEPENDS = "libpng libav libsndfile1" | ||
8 | |||
9 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ | ||
10 | ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ | ||
11 | " | ||
12 | PACKAGECONFIG[pulseaudio] = "--with-pulseaudio=dyn,--with-pulseaudio=no,pulseaudio," | ||
13 | PACKAGECONFIG[alsa] = "--with-alsa=dyn,--with-alsa=no,alsa-lib," | ||
14 | |||
15 | LICENSE = "GPLv2 & LGPLv2.1" | ||
16 | LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe \ | ||
17 | file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24" | ||
18 | |||
19 | SRC_URI = "${SOURCEFORGE_MIRROR}/sox/sox-${PV}.tar.gz" | ||
20 | SRC_URI[md5sum] = "b0c15cff7a4ba0ec17fdc74e6a1f9cf1" | ||
21 | SRC_URI[sha256sum] = "3ee34b14dd267de378e8a117aae81ec4cae330772342e6a55bbf6520a0a88aa3" | ||
22 | |||
23 | inherit autotools | ||
24 | |||
25 | BBCLASSEXTEND = "native" | ||
26 | |||
diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass index db35717f6..a2c8ddf0e 100644 --- a/meta-oe/classes/systemd.bbclass +++ b/meta-oe/classes/systemd.bbclass | |||
@@ -1,5 +1,7 @@ | |||
1 | DEPENDS_append = " systemd-systemctl-native" | 1 | DEPENDS_append = " systemd-systemctl-native" |
2 | 2 | ||
3 | SYSTEMD_AUTO_ENABLE ??= "enable" | ||
4 | |||
3 | systemd_postinst() { | 5 | systemd_postinst() { |
4 | OPTS="" | 6 | OPTS="" |
5 | 7 | ||
@@ -7,9 +9,9 @@ if [ -n "$D" ]; then | |||
7 | OPTS="--root=$D" | 9 | OPTS="--root=$D" |
8 | fi | 10 | fi |
9 | 11 | ||
10 | systemctl $OPTS enable ${SYSTEMD_SERVICE} | 12 | systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} ${SYSTEMD_SERVICE} |
11 | 13 | ||
12 | if [ -z "$D" ]; then | 14 | if [ -z "$D" -a ${SYSTEMD_AUTO_ENABLE} = "enable" ]; then |
13 | systemctl start ${SYSTEMD_SERVICE} | 15 | systemctl start ${SYSTEMD_SERVICE} |
14 | fi | 16 | fi |
15 | } | 17 | } |
@@ -24,6 +26,12 @@ systemd_postrm() { | |||
24 | systemctl disable ${SYSTEMD_SERVICE} | 26 | systemctl disable ${SYSTEMD_SERVICE} |
25 | } | 27 | } |
26 | 28 | ||
29 | def get_package_var(d, var, pkg): | ||
30 | val = (d.getVar('%s_%s' % (var, pkg), d, 1) or "").strip() | ||
31 | if val == "": | ||
32 | val = (d.getVar(var, d, 1) or "").strip() | ||
33 | return val | ||
34 | |||
27 | def systemd_after_parse(d): | 35 | def systemd_after_parse(d): |
28 | def systemd_check_vars(): | 36 | def systemd_check_vars(): |
29 | if d.getVar('BB_WORKERCONTEXT', True) is not None: | 37 | if d.getVar('BB_WORKERCONTEXT', True) is not None: |
@@ -40,25 +48,15 @@ def systemd_after_parse(d): | |||
40 | if pkg_systemd.find("-systemd") == -1: | 48 | if pkg_systemd.find("-systemd") == -1: |
41 | if pkg_systemd != d.getVar('PN', 1): | 49 | if pkg_systemd != d.getVar('PN', 1): |
42 | raise bb.build.FuncFailed, \ | 50 | raise bb.build.FuncFailed, \ |
43 | "\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN} (deprecated)" % \ | 51 | "\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN}" % \ |
44 | (bb_filename, pkg_systemd) | 52 | (bb_filename, pkg_systemd) |
45 | else: | ||
46 | # Only complain if recipe lacks native systemd support | ||
47 | native_systemd_support = d.getVar('NATIVE_SYSTEMD_SUPPORT', 1) or "" | ||
48 | if native_systemd_support == "": | ||
49 | bb.warn("%s: it is recommended to set SYSTEMD_PACKAGES as <existing-package>-systemd" % bb_filename) | ||
50 | else: | 53 | else: |
51 | pkg_systemd_base = pkg_systemd.replace('-systemd', '') | 54 | pkg_systemd_base = pkg_systemd.replace('-systemd', '') |
52 | if pkg_systemd_base not in packages: | 55 | if pkg_systemd_base not in packages: |
53 | raise bb.build.FuncFailed, \ | 56 | raise bb.build.FuncFailed, \ |
54 | "\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN} (deprecated)" % \ | 57 | "\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN}" % \ |
55 | ( bb_filename, pkg_systemd) | 58 | ( bb_filename, pkg_systemd) |
56 | 59 | ||
57 | # check SYSTEMD_SERVICE | ||
58 | for pkg_systemd in systemd_pkgs.split(): | ||
59 | service_pkg = 'SYSTEMD_SERVICE' + "_" + pkg_systemd | ||
60 | systemd_services = d.getVar(service_pkg, 1) or d.getVar('SYSTEMD_SERVICE', 1) or "" | ||
61 | |||
62 | # prepend systemd-packages not already included | 60 | # prepend systemd-packages not already included |
63 | def systemd_create_package(pkg_systemd): | 61 | def systemd_create_package(pkg_systemd): |
64 | packages = d.getVar('PACKAGES', 1) | 62 | packages = d.getVar('PACKAGES', 1) |
@@ -160,8 +158,7 @@ python populate_packages_prepend () { | |||
160 | systemd_packages = d.getVar('SYSTEMD_PACKAGES', 1) | 158 | systemd_packages = d.getVar('SYSTEMD_PACKAGES', 1) |
161 | has_exactly_one_service = len(systemd_packages.split()) == 1 | 159 | has_exactly_one_service = len(systemd_packages.split()) == 1 |
162 | if has_exactly_one_service: | 160 | if has_exactly_one_service: |
163 | systemd_services = d.getVar('SYSTEMD_SERVICE' + "_" + systemd_packages, 1) or d.getVar('SYSTEMD_SERVICE', 1) | 161 | has_exactly_one_service = len(get_package_var(d, 'SYSTEMD_SERVICE', systemd_packages).split()) == 1 |
164 | has_exactly_one_service = len(systemd_services.split()) == 1 | ||
165 | 162 | ||
166 | keys = 'Also' # Conflicts?? | 163 | keys = 'Also' # Conflicts?? |
167 | if has_exactly_one_service: | 164 | if has_exactly_one_service: |
@@ -169,8 +166,7 @@ python populate_packages_prepend () { | |||
169 | keys = 'Also Conflicts' | 166 | keys = 'Also Conflicts' |
170 | # scan for all in SYSTEMD_SERVICE[] | 167 | # scan for all in SYSTEMD_SERVICE[] |
171 | for pkg_systemd in systemd_packages.split(): | 168 | for pkg_systemd in systemd_packages.split(): |
172 | systemd_services = d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1) or d.getVar('SYSTEMD_SERVICE', 1) | 169 | for service in get_package_var(d, 'SYSTEMD_SERVICE', pkg_systemd).split(): |
173 | for service in systemd_services.split(): | ||
174 | path_found = '' | 170 | path_found = '' |
175 | for path in searchpaths.split(): | 171 | for path in searchpaths.split(): |
176 | if os.path.exists('${D}' + path + service): | 172 | if os.path.exists('${D}' + path + service): |
@@ -201,7 +197,7 @@ python populate_packages_prepend () { | |||
201 | # run all modifications once when creating package | 197 | # run all modifications once when creating package |
202 | if os.path.exists('${D}'): | 198 | if os.path.exists('${D}'): |
203 | for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split(): | 199 | for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split(): |
204 | if d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1) and d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1).strip(): | 200 | if get_package_var(d, 'SYSTEMD_SERVICE', pkg_systemd) != "": |
205 | systemd_generate_package_scripts(pkg_systemd) | 201 | systemd_generate_package_scripts(pkg_systemd) |
206 | systemd_add_rdepends(pkg_systemd) | 202 | systemd_add_rdepends(pkg_systemd) |
207 | systemd_check_services() | 203 | systemd_check_services() |
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_0.6.18.bb b/meta-oe/recipes-devtools/nodejs/nodejs_0.6.20.bb index 7136ffc6a..77ed388d3 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" | |||
7 | 7 | ||
8 | SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz \ | 8 | SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz \ |
9 | file://fix-hardfloat-detection.patch" | 9 | file://fix-hardfloat-detection.patch" |
10 | 10 | SRC_URI[md5sum] = "fcf8e0f2981f9dd66606a2162a2df55d" | |
11 | SRC_URI[md5sum] = "4a3d3123ccc7b9b21c1990fe074e3d14" | 11 | SRC_URI[sha256sum] = "b7bf4cf143ddf46ba5e975761b98a38dd3d72b176fd5d4bb2f9c9e7bbe6c4b15" |
12 | SRC_URI[sha256sum] = "6cf4311ecbc1700e88f4382a31b3a7017c1572cd641fd06e653fc1692c2cffff" | ||
13 | 12 | ||
14 | S = "${WORKDIR}/node-v${PV}" | 13 | S = "${WORKDIR}/node-v${PV}" |
15 | 14 | ||
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 639fd4fb0..000000000 --- a/meta-oe/recipes-devtools/orc/orc_0.4.14.bb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | require orc.inc | ||
2 | |||
3 | PR = "${INC_PR}.0" | ||
4 | |||
5 | SRC_URI[orc.md5sum] = "6b3ff209e9763ebe40e152538884bd71" | ||
6 | 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 000000000..bb193ab6c --- /dev/null +++ b/meta-oe/recipes-devtools/orc/orc_0.4.16.bb | |||
@@ -0,0 +1,6 @@ | |||
1 | require orc.inc | ||
2 | |||
3 | PR = "${INC_PR}.0" | ||
4 | |||
5 | SRC_URI[orc.md5sum] = "e482932e544c847761449b106ecbc483" | ||
6 | SRC_URI[orc.sha256sum] = "700e4edba20a0ed42164b645da26ce515b883d4c4633b222302f1e541f2a58ab" | ||