summaryrefslogtreecommitdiffstats
path: root/meta-filesystems/recipes-utils
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2021-07-29 17:04:53 +0200
committerKhem Raj <raj.khem@gmail.com>2021-08-03 10:21:25 -0700
commitc61dc077bbd81260e4f167fa2251643ba0ba6974 (patch)
tree66c3243f8f64ae60f66f70a16e8128c247254a65 /meta-filesystems/recipes-utils
parentc5f7cfb8db54cfa4257797db5bd87828dea43296 (diff)
downloadmeta-openembedded-c61dc077bbd81260e4f167fa2251643ba0ba6974.tar.gz
Convert to new override syntax
This is the result of automated script (0.9.1) conversion: oe-core/scripts/contrib/convert-overrides.py . converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-filesystems/recipes-utils')
-rw-r--r--meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb14
-rw-r--r--meta-filesystems/recipes-utils/udevil/udevil_0.4.4.bb4
-rw-r--r--meta-filesystems/recipes-utils/ufs-utils/ufs-utils_1.9.bb4
-rw-r--r--meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.12.0.bb14
-rw-r--r--meta-filesystems/recipes-utils/xorriso/xorriso_1.5.5.bb4
5 files changed, 20 insertions, 20 deletions
diff --git a/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb b/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb
index b4819d8fbf..d06aed75e7 100644
--- a/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb
+++ b/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" 5LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a"
6 6
7DEPENDS = "coreutils-native aufs-util-native" 7DEPENDS = "coreutils-native aufs-util-native"
8DEPENDS_class-native = "" 8DEPENDS:class-native = ""
9 9
10SRCREV = "8f35db59ef83078f87879ec2828e0bb45719e0ef" 10SRCREV = "8f35db59ef83078f87879ec2828e0bb45719e0ef"
11SRC_URI = "git://git.code.sf.net/p/aufs/aufs-util;protocol=git;branch=aufs4.9 \ 11SRC_URI = "git://git.code.sf.net/p/aufs/aufs-util;protocol=git;branch=aufs4.9 \
@@ -23,20 +23,20 @@ PV = "4.9+git${SRCPV}"
23S = "${WORKDIR}/git" 23S = "${WORKDIR}/git"
24 24
25export HOSTCC = "${BUILD_CC}" 25export HOSTCC = "${BUILD_CC}"
26do_configure_prepend() { 26do_configure:prepend() {
27 # Replace sbin,bin paths with bitbake environment 27 # Replace sbin,bin paths with bitbake environment
28 sed -i -e 's;install_sbin: Tgt = ${DESTDIR}/sbin;install_sbin: Tgt = ${DESTDIR}/${base_sbindir};' \ 28 sed -i -e 's;install_sbin: Tgt = ${DESTDIR}/sbin;install_sbin: Tgt = ${DESTDIR}/${base_sbindir};' \
29 -e 's;install_ubin: Tgt = ${DESTDIR}/usr/sbin;install_sbin: Tgt = ${DESTDIR}/${bindir};' \ 29 -e 's;install_ubin: Tgt = ${DESTDIR}/usr/sbin;install_sbin: Tgt = ${DESTDIR}/${bindir};' \
30 ${S}/Makefile 30 ${S}/Makefile
31} 31}
32 32
33do_configure_append () { 33do_configure:append () {
34 install -d ${S}/include/linux/ 34 install -d ${S}/include/linux/
35 cp ${WORKDIR}/aufs_type.h ${S}/include/linux/ 35 cp ${WORKDIR}/aufs_type.h ${S}/include/linux/
36 sed -i -e 's;__user;;' ${S}/include/linux/aufs_type.h 36 sed -i -e 's;__user;;' ${S}/include/linux/aufs_type.h
37} 37}
38 38
39do_configure_append_class-target () { 39do_configure:append:class-target () {
40 for i in ver c2sh c2tmac; do 40 for i in ver c2sh c2tmac; do
41 cp ${STAGING_BINDIR_NATIVE}/aufs-util-${PV}/$i ${B} 41 cp ${STAGING_BINDIR_NATIVE}/aufs-util-${PV}/$i ${B}
42 done 42 done
@@ -46,7 +46,7 @@ do_compile () {
46 oe_runmake CPPFLAGS="-I${S}/include -I${S}/libau" 46 oe_runmake CPPFLAGS="-I${S}/include -I${S}/libau"
47} 47}
48 48
49do_compile_class-native () { 49do_compile:class-native () {
50 oe_runmake tools CPPFLAGS="-I${S}/include -I${S}/libau" CC="${BUILD_CC}" 50 oe_runmake tools CPPFLAGS="-I${S}/include -I${S}/libau" CC="${BUILD_CC}"
51} 51}
52 52
@@ -54,13 +54,13 @@ do_install () {
54 oe_runmake 'DESTDIR=${D}' install_sbin install_ubin install_etc 54 oe_runmake 'DESTDIR=${D}' install_sbin install_ubin install_etc
55} 55}
56 56
57do_install_class-native () { 57do_install:class-native () {
58 install -d ${D}${bindir}/aufs-util-${PV} 58 install -d ${D}${bindir}/aufs-util-${PV}
59 for i in ver c2sh c2tmac; do 59 for i in ver c2sh c2tmac; do
60 install -m 755 $i ${D}${bindir}/aufs-util-${PV}/$i 60 install -m 755 $i ${D}${bindir}/aufs-util-${PV}/$i
61 done 61 done
62} 62}
63 63
64RRECOMMENDS_${PN}_class-target += "kernel-module-aufs" 64RRECOMMENDS:${PN}:class-target += "kernel-module-aufs"
65 65
66BBCLASSEXTEND = "native" 66BBCLASSEXTEND = "native"
diff --git a/meta-filesystems/recipes-utils/udevil/udevil_0.4.4.bb b/meta-filesystems/recipes-utils/udevil/udevil_0.4.4.bb
index 60f84f8f9c..1e88ced90e 100644
--- a/meta-filesystems/recipes-utils/udevil/udevil_0.4.4.bb
+++ b/meta-filesystems/recipes-utils/udevil/udevil_0.4.4.bb
@@ -6,7 +6,7 @@ DEPENDS = "glib-2.0 \
6 intltool-native \ 6 intltool-native \
7 udev \ 7 udev \
8" 8"
9RDEPENDS_${PN} = "udev bash" 9RDEPENDS:${PN} = "udev bash"
10 10
11LICENSE = "GPL-3.0" 11LICENSE = "GPL-3.0"
12LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 12LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
@@ -24,5 +24,5 @@ SRC_URI[sha256sum] = "ce8c51fd4d589cda7be56e75b42188deeb258c66fc911a9b3a70a3945c
24PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" 24PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}"
25PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" 25PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
26 26
27SYSTEMD_SERVICE_${PN} = "devmon@.service" 27SYSTEMD_SERVICE:${PN} = "devmon@.service"
28SYSTEMD_AUTO_ENABLE = "disable" 28SYSTEMD_AUTO_ENABLE = "disable"
diff --git a/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_1.9.bb b/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_1.9.bb
index e23c764a03..12943b23a9 100644
--- a/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_1.9.bb
+++ b/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_1.9.bb
@@ -16,7 +16,7 @@ S = "${WORKDIR}/git"
16 16
17EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}" CFLAGS="${CFLAGS}"" 17EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}" CFLAGS="${CFLAGS}""
18 18
19CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__ -D_GNU_SOURCE" 19CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__ -D_GNU_SOURCE"
20 20
21do_configure() { 21do_configure() {
22 sed -i -e "s|-static$||g" ${S}/Makefile 22 sed -i -e "s|-static$||g" ${S}/Makefile
@@ -28,5 +28,5 @@ do_install() {
28 28
29PROVIDES += "ufs-tool" 29PROVIDES += "ufs-tool"
30 30
31RPROVIDES_${PN} += "ufs-tool" 31RPROVIDES:${PN} += "ufs-tool"
32 32
diff --git a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.12.0.bb b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.12.0.bb
index c2d0595290..323493e7e1 100644
--- a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.12.0.bb
+++ b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.12.0.bb
@@ -2,7 +2,7 @@ SUMMARY = "XFS Filesystem Utilities"
2HOMEPAGE = "http://oss.sgi.com/projects/xfs" 2HOMEPAGE = "http://oss.sgi.com/projects/xfs"
3SECTION = "base" 3SECTION = "base"
4LICENSE = "GPLv2 & LGPLv2.1" 4LICENSE = "GPLv2 & LGPLv2.1"
5LICENSE_libhandle = "LGPLv2.1" 5LICENSE:libhandle = "LGPLv2.1"
6LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 \ 6LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 \
7 file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd" 7 file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd"
8DEPENDS = "util-linux util-linux-native" 8DEPENDS = "util-linux util-linux-native"
@@ -19,13 +19,13 @@ PACKAGES =+ "${PN}-fsck ${PN}-mkfs ${PN}-repair libhandle"
19 19
20DEPENDS += "util-linux libinih" 20DEPENDS += "util-linux libinih"
21 21
22RDEPENDS_${PN} = "${PN}-fsck ${PN}-mkfs ${PN}-repair" 22RDEPENDS:${PN} = "${PN}-fsck ${PN}-mkfs ${PN}-repair"
23 23
24FILES_${PN}-fsck = "${base_sbindir}/fsck.xfs" 24FILES:${PN}-fsck = "${base_sbindir}/fsck.xfs"
25FILES_${PN}-mkfs = "${base_sbindir}/mkfs.xfs" 25FILES:${PN}-mkfs = "${base_sbindir}/mkfs.xfs"
26FILES_${PN}-repair = "${base_sbindir}/xfs_repair" 26FILES:${PN}-repair = "${base_sbindir}/xfs_repair"
27 27
28FILES_libhandle = "${base_libdir}/libhandle${SOLIBS}" 28FILES:libhandle = "${base_libdir}/libhandle${SOLIBS}"
29 29
30EXTRA_OECONF = "--enable-gettext=no \ 30EXTRA_OECONF = "--enable-gettext=no \
31 --enable-scrub=no \ 31 --enable-scrub=no \
@@ -61,7 +61,7 @@ do_configure () {
61 oe_runconf 61 oe_runconf
62} 62}
63 63
64do_install_append() { 64do_install:append() {
65 oe_runmake 'DESTDIR=${D}' install-dev 65 oe_runmake 'DESTDIR=${D}' install-dev
66 rm ${D}${libdir}/*.la 66 rm ${D}${libdir}/*.la
67 rmdir --ignore-fail-on-non-empty ${D}${libdir} 67 rmdir --ignore-fail-on-non-empty ${D}${libdir}
diff --git a/meta-filesystems/recipes-utils/xorriso/xorriso_1.5.5.bb b/meta-filesystems/recipes-utils/xorriso/xorriso_1.5.5.bb
index 75b66d9230..cf0092291a 100644
--- a/meta-filesystems/recipes-utils/xorriso/xorriso_1.5.5.bb
+++ b/meta-filesystems/recipes-utils/xorriso/xorriso_1.5.5.bb
@@ -19,11 +19,11 @@ PACKAGECONFIG[readline] = "--enable-libreadline,--disable-libreadline,readline,"
19 19
20inherit autotools-brokensep pkgconfig features_check 20inherit autotools-brokensep pkgconfig features_check
21 21
22do_configure_prepend () { 22do_configure:prepend () {
23 touch NEWS 23 touch NEWS
24} 24}
25 25
26RDEPENDS_${PN} = "tk" 26RDEPENDS:${PN} = "tk"
27REQUIRED_DISTRO_FEATURES = "x11" 27REQUIRED_DISTRO_FEATURES = "x11"
28 28
29BBCLASSEXTEND = "native" 29BBCLASSEXTEND = "native"