diff options
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/cups/cups.inc | 2 | ||||
-rw-r--r-- | meta/recipes-extended/man/man_1.6g.bb | 4 | ||||
-rw-r--r-- | meta/recipes-extended/net-tools/net-tools_1.60-26.bb | 8 | ||||
-rw-r--r-- | meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | 4 | ||||
-rw-r--r-- | meta/recipes-extended/pam/libpam_1.3.0.bb | 14 | ||||
-rw-r--r-- | meta/recipes-extended/procps/procps_3.3.12.bb | 8 | ||||
-rw-r--r-- | meta/recipes-extended/texinfo/texinfo_6.3.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/tzdata/tzdata_2016i.bb | 2 |
9 files changed, 23 insertions, 23 deletions
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index e18980bcca..2ce9c7a179 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc | |||
@@ -83,7 +83,7 @@ do_install () { | |||
83 | python do_package_append() { | 83 | python do_package_append() { |
84 | import subprocess | 84 | import subprocess |
85 | # Change permissions back the way they were, they probably had a reason... | 85 | # Change permissions back the way they were, they probably had a reason... |
86 | workdir = d.getVar('WORKDIR', True) | 86 | workdir = d.getVar('WORKDIR') |
87 | subprocess.call('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir, shell=True) | 87 | subprocess.call('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir, shell=True) |
88 | } | 88 | } |
89 | 89 | ||
diff --git a/meta/recipes-extended/man/man_1.6g.bb b/meta/recipes-extended/man/man_1.6g.bb index e78aa18cbc..ff603f842c 100644 --- a/meta/recipes-extended/man/man_1.6g.bb +++ b/meta/recipes-extended/man/man_1.6g.bb | |||
@@ -10,8 +10,8 @@ PR = "r1" | |||
10 | DEPENDS = "groff less" | 10 | DEPENDS = "groff less" |
11 | 11 | ||
12 | def compress_pkg(d): | 12 | def compress_pkg(d): |
13 | if "compress_doc" in (d.getVar("INHERIT", True) or "").split(): | 13 | if "compress_doc" in (d.getVar("INHERIT") or "").split(): |
14 | compress = d.getVar("DOC_COMPRESS", True) | 14 | compress = d.getVar("DOC_COMPRESS") |
15 | if compress == "gz": | 15 | if compress == "gz": |
16 | return "gzip" | 16 | return "gzip" |
17 | elif compress == "bz2": | 17 | elif compress == "bz2": |
diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb index 47a68a59ac..49a65f873a 100644 --- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb +++ b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb | |||
@@ -106,10 +106,10 @@ ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" | |||
106 | ALTERNATIVE_PRIORITY[hostname.1] = "10" | 106 | ALTERNATIVE_PRIORITY[hostname.1] = "10" |
107 | 107 | ||
108 | python __anonymous() { | 108 | python __anonymous() { |
109 | for prog in d.getVar('base_sbindir_progs', True).split(): | 109 | for prog in d.getVar('base_sbindir_progs').split(): |
110 | d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir', True), prog)) | 110 | d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir'), prog)) |
111 | for prog in d.getVar('base_bindir_progs', True).split(): | 111 | for prog in d.getVar('base_bindir_progs').split(): |
112 | d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir', True), prog)) | 112 | d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir'), prog)) |
113 | } | 113 | } |
114 | ALTERNATIVE_PRIORITY = "100" | 114 | ALTERNATIVE_PRIORITY = "100" |
115 | 115 | ||
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb index a60a68cbf2..d8975f2157 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb | |||
@@ -31,7 +31,7 @@ python __anonymous () { | |||
31 | namemap["packagegroup-core-full-cmdline-initscripts"] = "packagegroup-core-initscripts" | 31 | namemap["packagegroup-core-full-cmdline-initscripts"] = "packagegroup-core-initscripts" |
32 | namemap["packagegroup-core-full-cmdline-sys-services"] = "packagegroup-core-sys-services" | 32 | namemap["packagegroup-core-full-cmdline-sys-services"] = "packagegroup-core-sys-services" |
33 | 33 | ||
34 | packages = d.getVar("PACKAGES", True).split() | 34 | packages = d.getVar("PACKAGES").split() |
35 | for pkg in packages: | 35 | for pkg in packages: |
36 | if pkg.endswith('-dev'): | 36 | if pkg.endswith('-dev'): |
37 | mapped = namemap.get(pkg[:-4], None) | 37 | mapped = namemap.get(pkg[:-4], None) |
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb index 29564e0c9d..734dda1d79 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | |||
@@ -15,9 +15,9 @@ REQUIRED_DISTRO_FEATURES = "x11" | |||
15 | # We will skip parsing this packagegeoup for non-glibc systems | 15 | # We will skip parsing this packagegeoup for non-glibc systems |
16 | # | 16 | # |
17 | python __anonymous () { | 17 | python __anonymous () { |
18 | if d.getVar('TCLIBC', True) != "glibc": | 18 | if d.getVar('TCLIBC') != "glibc": |
19 | raise bb.parse.SkipPackage("incompatible with %s C library" % | 19 | raise bb.parse.SkipPackage("incompatible with %s C library" % |
20 | d.getVar('TCLIBC', True)) | 20 | d.getVar('TCLIBC')) |
21 | } | 21 | } |
22 | 22 | ||
23 | PACKAGES = "\ | 23 | PACKAGES = "\ |
diff --git a/meta/recipes-extended/pam/libpam_1.3.0.bb b/meta/recipes-extended/pam/libpam_1.3.0.bb index bb5a4bd8d3..67b9d53d33 100644 --- a/meta/recipes-extended/pam/libpam_1.3.0.bb +++ b/meta/recipes-extended/pam/libpam_1.3.0.bb | |||
@@ -62,7 +62,7 @@ FILES_${PN}-xtests = "${datadir}/Linux-PAM/xtests" | |||
62 | PACKAGES_DYNAMIC += "^${MLPREFIX}pam-plugin-.*" | 62 | PACKAGES_DYNAMIC += "^${MLPREFIX}pam-plugin-.*" |
63 | 63 | ||
64 | def get_multilib_bit(d): | 64 | def get_multilib_bit(d): |
65 | baselib = d.getVar('baselib', True) or '' | 65 | baselib = d.getVar('baselib') or '' |
66 | return baselib.replace('lib', '') | 66 | return baselib.replace('lib', '') |
67 | 67 | ||
68 | libpam_suffix = "suffix${@get_multilib_bit(d)}" | 68 | libpam_suffix = "suffix${@get_multilib_bit(d)}" |
@@ -92,30 +92,30 @@ RRECOMMENDS_${PN}_class-native = "" | |||
92 | python populate_packages_prepend () { | 92 | python populate_packages_prepend () { |
93 | def pam_plugin_append_file(pn, dir, file): | 93 | def pam_plugin_append_file(pn, dir, file): |
94 | nf = os.path.join(dir, file) | 94 | nf = os.path.join(dir, file) |
95 | of = d.getVar('FILES_' + pn, True) | 95 | of = d.getVar('FILES_' + pn) |
96 | if of: | 96 | if of: |
97 | nf = of + " " + nf | 97 | nf = of + " " + nf |
98 | d.setVar('FILES_' + pn, nf) | 98 | d.setVar('FILES_' + pn, nf) |
99 | 99 | ||
100 | def pam_plugin_hook(file, pkg, pattern, format, basename): | 100 | def pam_plugin_hook(file, pkg, pattern, format, basename): |
101 | pn = d.getVar('PN', True) | 101 | pn = d.getVar('PN') |
102 | libpam_suffix = d.getVar('libpam_suffix', True) | 102 | libpam_suffix = d.getVar('libpam_suffix') |
103 | 103 | ||
104 | rdeps = d.getVar('RDEPENDS_' + pkg, True) | 104 | rdeps = d.getVar('RDEPENDS_' + pkg) |
105 | if rdeps: | 105 | if rdeps: |
106 | rdeps = rdeps + " " + pn + "-" + libpam_suffix | 106 | rdeps = rdeps + " " + pn + "-" + libpam_suffix |
107 | else: | 107 | else: |
108 | rdeps = pn + "-" + libpam_suffix | 108 | rdeps = pn + "-" + libpam_suffix |
109 | d.setVar('RDEPENDS_' + pkg, rdeps) | 109 | d.setVar('RDEPENDS_' + pkg, rdeps) |
110 | 110 | ||
111 | provides = d.getVar('RPROVIDES_' + pkg, True) | 111 | provides = d.getVar('RPROVIDES_' + pkg) |
112 | if provides: | 112 | if provides: |
113 | provides = provides + " " + pkg + "-" + libpam_suffix | 113 | provides = provides + " " + pkg + "-" + libpam_suffix |
114 | else: | 114 | else: |
115 | provides = pkg + "-" + libpam_suffix | 115 | provides = pkg + "-" + libpam_suffix |
116 | d.setVar('RPROVIDES_' + pkg, provides) | 116 | d.setVar('RPROVIDES_' + pkg, provides) |
117 | 117 | ||
118 | mlprefix = d.getVar('MLPREFIX', True) or '' | 118 | mlprefix = d.getVar('MLPREFIX') or '' |
119 | dvar = bb.data.expand('${WORKDIR}/package', d, True) | 119 | dvar = bb.data.expand('${WORKDIR}/package', d, True) |
120 | pam_libdir = d.expand('${base_libdir}/security') | 120 | pam_libdir = d.expand('${base_libdir}/security') |
121 | pam_sbindir = d.expand('${sbindir}') | 121 | pam_sbindir = d.expand('${sbindir}') |
diff --git a/meta/recipes-extended/procps/procps_3.3.12.bb b/meta/recipes-extended/procps/procps_3.3.12.bb index 4ca1a5023b..1f793b9cac 100644 --- a/meta/recipes-extended/procps/procps_3.3.12.bb +++ b/meta/recipes-extended/procps/procps_3.3.12.bb | |||
@@ -57,10 +57,10 @@ ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" | |||
57 | ALTERNATIVE_LINK_NAME[uptime.1] = "${mandir}/man1/uptime.1" | 57 | ALTERNATIVE_LINK_NAME[uptime.1] = "${mandir}/man1/uptime.1" |
58 | 58 | ||
59 | python __anonymous() { | 59 | python __anonymous() { |
60 | for prog in d.getVar('base_bindir_progs', True).split(): | 60 | for prog in d.getVar('base_bindir_progs').split(): |
61 | d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir', True), prog)) | 61 | d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir'), prog)) |
62 | 62 | ||
63 | for prog in d.getVar('base_sbindir_progs', True).split(): | 63 | for prog in d.getVar('base_sbindir_progs').split(): |
64 | d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir', True), prog)) | 64 | d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir'), prog)) |
65 | } | 65 | } |
66 | 66 | ||
diff --git a/meta/recipes-extended/texinfo/texinfo_6.3.bb b/meta/recipes-extended/texinfo/texinfo_6.3.bb index 51199be758..d82731e11e 100644 --- a/meta/recipes-extended/texinfo/texinfo_6.3.bb +++ b/meta/recipes-extended/texinfo/texinfo_6.3.bb | |||
@@ -11,7 +11,7 @@ PROVIDES_append_class-native = " texinfo-replacement-native" | |||
11 | 11 | ||
12 | def compress_pkg(d): | 12 | def compress_pkg(d): |
13 | if bb.data.inherits_class('compress_doc', d): | 13 | if bb.data.inherits_class('compress_doc', d): |
14 | compress = d.getVar("DOC_COMPRESS", True) | 14 | compress = d.getVar("DOC_COMPRESS") |
15 | if compress == "gz": | 15 | if compress == "gz": |
16 | return "gzip" | 16 | return "gzip" |
17 | elif compress == "bz2": | 17 | elif compress == "bz2": |
diff --git a/meta/recipes-extended/tzdata/tzdata_2016i.bb b/meta/recipes-extended/tzdata/tzdata_2016i.bb index 3801a3fced..46488cda58 100644 --- a/meta/recipes-extended/tzdata/tzdata_2016i.bb +++ b/meta/recipes-extended/tzdata/tzdata_2016i.bb | |||
@@ -209,5 +209,5 @@ FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \ | |||
209 | ${datadir}/zoneinfo/iso3166.tab \ | 209 | ${datadir}/zoneinfo/iso3166.tab \ |
210 | ${datadir}/zoneinfo/Etc/*" | 210 | ${datadir}/zoneinfo/Etc/*" |
211 | 211 | ||
212 | CONFFILES_${PN} += "${@ "${sysconfdir}/timezone" if bb.utils.to_boolean(d.getVar('INSTALL_TIMEZONE_FILE', True)) else "" }" | 212 | CONFFILES_${PN} += "${@ "${sysconfdir}/timezone" if bb.utils.to_boolean(d.getVar('INSTALL_TIMEZONE_FILE')) else "" }" |
213 | CONFFILES_${PN} += "${sysconfdir}/localtime" | 213 | CONFFILES_${PN} += "${sysconfdir}/localtime" |