mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-13 17:39:57 +00:00
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>
This commit is contained in:
@@ -14,7 +14,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git;protocol=http \
|
||||
"
|
||||
|
||||
DEPENDS += "kmod"
|
||||
DEPENDS_append_libc-musl = " fts"
|
||||
DEPENDS:append:libc-musl = " fts"
|
||||
|
||||
inherit bash-completion pkgconfig
|
||||
|
||||
@@ -37,7 +37,7 @@ PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/
|
||||
|
||||
EXTRA_OEMAKE += 'libdir=${prefix}/lib LDLIBS="${LDLIBS}"'
|
||||
|
||||
LDLIBS_append_libc-musl = " -lfts"
|
||||
LDLIBS:append:libc-musl = " -lfts"
|
||||
|
||||
do_configure() {
|
||||
./configure ${EXTRA_OECONF}
|
||||
@@ -50,18 +50,18 @@ do_install() {
|
||||
chown -R root:root ${D}/${prefix}/lib/dracut/modules.d
|
||||
}
|
||||
|
||||
FILES_${PN} += "${prefix}/lib/kernel \
|
||||
FILES:${PN} += "${prefix}/lib/kernel \
|
||||
${prefix}/lib/dracut \
|
||||
${systemd_unitdir} \
|
||||
"
|
||||
FILES_${PN}-dbg += "${prefix}/lib/dracut/.debug"
|
||||
FILES:${PN}-dbg += "${prefix}/lib/dracut/.debug"
|
||||
|
||||
CONFFILES_${PN} += "${sysconfdir}/dracut.conf"
|
||||
CONFFILES:${PN} += "${sysconfdir}/dracut.conf"
|
||||
|
||||
RDEPENDS_${PN} = "findutils cpio util-linux-blkid util-linux-getopt util-linux bash ldd"
|
||||
RDEPENDS:${PN} = "findutils cpio util-linux-blkid util-linux-getopt util-linux bash ldd"
|
||||
|
||||
# This could be optimized a bit, but let's avoid non-booting systems :)
|
||||
RRECOMMENDS_${PN} = " \
|
||||
RRECOMMENDS:${PN} = " \
|
||||
kernel-modules \
|
||||
busybox \
|
||||
coreutils \
|
||||
|
||||
@@ -10,7 +10,7 @@ LICENSE = "GPLv2+"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a"
|
||||
|
||||
DEPENDS = "popt util-linux"
|
||||
DEPENDS_append_libc-musl = " libexecinfo"
|
||||
DEPENDS:append:libc-musl = " libexecinfo"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
SRCREV = "79c5cfa02c567efdc5bb18cdd584789e2e35aa23"
|
||||
@@ -21,13 +21,13 @@ SRC_URI = "git://github.com/rhboot/grubby.git;protocol=https; \
|
||||
file://0002-include-paths.h-for-_PATH_MOUNTED.patch \
|
||||
"
|
||||
|
||||
RDEPENDS_${PN} += "dracut"
|
||||
RDEPENDS:${PN} += "dracut"
|
||||
|
||||
inherit autotools-brokensep ptest
|
||||
|
||||
EXTRA_OEMAKE = "-e 'CC=${CC}' 'LDFLAGS=${LDFLAGS}' LIBS='${LIBS}'"
|
||||
|
||||
LIBS_libc-musl = "-lexecinfo"
|
||||
LIBS:libc-musl = "-lexecinfo"
|
||||
LIBS ?= ""
|
||||
do_install_ptest() {
|
||||
install -d ${D}${PTEST_PATH}
|
||||
@@ -35,7 +35,7 @@ do_install_ptest() {
|
||||
sed -i 's|./grubby|grubby|' ${D}${PTEST_PATH}/test.sh
|
||||
}
|
||||
|
||||
RDEPENDS_${PN} += "bash"
|
||||
RDEPENDS_${PN}-ptest = "util-linux-getopt bash"
|
||||
RDEPENDS:${PN} += "bash"
|
||||
RDEPENDS:${PN}-ptest = "util-linux-getopt bash"
|
||||
|
||||
COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)'
|
||||
|
||||
@@ -10,7 +10,7 @@ LICENSE = "GPLv2+"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a"
|
||||
|
||||
DEPENDS = "popt util-linux"
|
||||
DEPENDS_append_libc-musl = " libexecinfo"
|
||||
DEPENDS:append:libc-musl = " libexecinfo"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
SRCREV = "a1d2ae93408c3408e672d7eba4550fdf27fb0201"
|
||||
@@ -21,13 +21,13 @@ SRC_URI = "git://github.com/rhboot/grubby.git;protocol=https; \
|
||||
file://0002-include-paths.h-for-_PATH_MOUNTED.patch \
|
||||
"
|
||||
|
||||
RDEPENDS_${PN} += "dracut"
|
||||
RDEPENDS:${PN} += "dracut"
|
||||
|
||||
inherit autotools-brokensep ptest
|
||||
|
||||
EXTRA_OEMAKE = "-e 'CC=${CC}' 'LDFLAGS=${LDFLAGS}' LIBS='${LIBS}' 'PREFIX'=${@bb.utils.contains('DISTRO_FEATURES','usrmerge','/usr','',d)}"
|
||||
|
||||
LIBS_libc-musl = "-lexecinfo"
|
||||
LIBS:libc-musl = "-lexecinfo"
|
||||
LIBS ?= ""
|
||||
do_install_ptest() {
|
||||
install -d ${D}${PTEST_PATH}
|
||||
@@ -35,7 +35,7 @@ do_install_ptest() {
|
||||
sed -i 's|./grubby|grubby|' ${D}${PTEST_PATH}/test.sh
|
||||
}
|
||||
|
||||
RDEPENDS_${PN} += "bash"
|
||||
RDEPENDS_${PN}-ptest = "util-linux-getopt bash"
|
||||
RDEPENDS:${PN} += "bash"
|
||||
RDEPENDS:${PN}-ptest = "util-linux-getopt bash"
|
||||
|
||||
COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)'
|
||||
|
||||
@@ -3,7 +3,7 @@ SUMMARY = "klibc utils for initramfs statically compiled"
|
||||
FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:"
|
||||
|
||||
PACKAGES = "${PN}"
|
||||
FILES_${PN} = ""
|
||||
FILES:${PN} = ""
|
||||
|
||||
KLIBC_UTILS_VARIANT = "static"
|
||||
KLIBC_UTILS_PKGNAME = "klibc-static-utils"
|
||||
|
||||
@@ -50,7 +50,7 @@ EXTRA_KLIBC_DEPS = "${@oe.utils.conditional('KLIBC_UTILS_VARIANT', 'shared', '${
|
||||
|
||||
PACKAGES_DYNAMIC += "^${KLIBC_UTILS_PKGNAME}-.*"
|
||||
|
||||
python populate_packages_prepend () {
|
||||
python populate_packages:prepend () {
|
||||
base_bin_dir = d.expand('${base_bindir}')
|
||||
do_split_packages(d, base_bin_dir, '(.*)', '${KLIBC_UTILS_PKGNAME}-%s', 'Klibc util for %s', extra_depends='${EXTRA_KLIBC_DEPS}', allow_links=True, allow_dirs=True)
|
||||
base_sbin_dir = d.expand('${base_sbindir}')
|
||||
|
||||
@@ -3,7 +3,7 @@ SUMMARY = "klibc utils for initramfs"
|
||||
FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:"
|
||||
|
||||
PACKAGES = "${PN}"
|
||||
FILES_${PN} = ""
|
||||
FILES:${PN} = ""
|
||||
|
||||
KLIBC_UTILS_VARIANT = "shared"
|
||||
KLIBC_UTILS_PKGNAME = "klibc-utils"
|
||||
|
||||
@@ -25,7 +25,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/klibc/2.0/klibc-${PV}.tar.xz \
|
||||
|
||||
ARMPATCHES ?= ""
|
||||
|
||||
ARMPATCHES_arm = " \
|
||||
ARMPATCHES:arm = " \
|
||||
file://armv4-fix-v4bx.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "4e48f1398cfe3ce0b6df55ce6e70acf54fc8488e3aea3fb3610ee1622d9cb436"
|
||||
@@ -33,8 +33,8 @@ SRC_URI[sha256sum] = "4e48f1398cfe3ce0b6df55ce6e70acf54fc8488e3aea3fb3610ee1622d
|
||||
S = "${WORKDIR}/klibc-${PV}"
|
||||
|
||||
OPTFLAGS = "${TUNE_CCARGS} -Os -fcommon"
|
||||
OPTFLAGS_append_toolchain-clang = " -fno-builtin-bcmp"
|
||||
OPTFLAGS_append_toolchain-clang_mipsarch = " -no-integrated-as"
|
||||
OPTFLAGS:append:toolchain-clang = " -fno-builtin-bcmp"
|
||||
OPTFLAGS:append:toolchain-clang:mipsarch = " -no-integrated-as"
|
||||
|
||||
PARALLEL_MAKE = ""
|
||||
EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \
|
||||
@@ -57,22 +57,22 @@ do_configure () {
|
||||
ln -sf "${STAGING_DIR_TARGET}${exec_prefix}" linux
|
||||
}
|
||||
|
||||
do_compile_prepend_toolchain-clang() {
|
||||
do_compile:prepend:toolchain-clang() {
|
||||
sed -i -e 's#$(KLIBCROSS)gcc#$(KLIBCROSS)clang#g' ${S}/Makefile
|
||||
}
|
||||
|
||||
INHIBIT_PACKAGE_STRIP = "1"
|
||||
INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
|
||||
INSANE_SKIP_${PN} = "already-stripped"
|
||||
INSANE_SKIP_libklibc-dev = "dev-elf"
|
||||
INSANE_SKIP:${PN} = "already-stripped"
|
||||
INSANE_SKIP:libklibc-dev = "dev-elf"
|
||||
KLIBC_ARCH = "${TARGET_ARCH}"
|
||||
KLIBC_ARCH_aarch64 = "arm64"
|
||||
KLIBC_ARCH_armeb = "arm"
|
||||
KLIBC_ARCH_mipsel = "mips"
|
||||
KLIBC_ARCH_mips64el = "mips64"
|
||||
KLIBC_ARCH_x86 = "i386"
|
||||
KLIBC_ARCH_x86-64 = "x86_64"
|
||||
KLIBC_ARCH_powerpc = "ppc"
|
||||
KLIBC_ARCH_powerpc64 = "ppc64"
|
||||
KLIBC_ARCH_powerpc64le = "ppc64"
|
||||
KLIBC_ARCH:aarch64 = "arm64"
|
||||
KLIBC_ARCH:armeb = "arm"
|
||||
KLIBC_ARCH:mipsel = "mips"
|
||||
KLIBC_ARCH:mips64el = "mips64"
|
||||
KLIBC_ARCH:x86 = "i386"
|
||||
KLIBC_ARCH:x86-64 = "x86_64"
|
||||
KLIBC_ARCH:powerpc = "ppc"
|
||||
KLIBC_ARCH:powerpc64 = "ppc64"
|
||||
KLIBC_ARCH:powerpc64le = "ppc64"
|
||||
THIS_LIBKLIBC = "libklibc (= ${PV}-${PR})"
|
||||
|
||||
@@ -16,9 +16,9 @@ do_install() {
|
||||
|
||||
PACKAGES = "libklibc libklibc-staticdev libklibc-dev"
|
||||
|
||||
FILES_libklibc = "${libdir}/klibc-*.so"
|
||||
FILES_libklibc-staticdev = "${libdir}/klibc/lib/libc.a"
|
||||
FILES_libklibc-dev = "${libdir}/klibc.so \
|
||||
FILES:libklibc = "${libdir}/klibc-*.so"
|
||||
FILES:libklibc-staticdev = "${libdir}/klibc/lib/libc.a"
|
||||
FILES:libklibc-dev = "${libdir}/klibc.so \
|
||||
${libdir}/klibc/lib/* \
|
||||
${libdir}/klibc/include/* \
|
||||
"
|
||||
|
||||
@@ -38,16 +38,16 @@ PACKAGES =+ "mtdinfo-klibc ubiattach-klibc ubiblock-klibc ubicrc32-klibc ubideta
|
||||
ubiformat-klibc ubimkvol-klibc ubinfo-klibc ubinize-klibc ubirename-klibc \
|
||||
ubirmvol-klibc ubirsvol-klibc ubiupdatevol-klibc"
|
||||
|
||||
FILES_mtdinfo-klibc = "${sbindir}/mtdinfo"
|
||||
FILES_ubiattach-klibc = "${sbindir}/ubiattach"
|
||||
FILES_ubiblock-klibc = "${sbindir}/ubiblock"
|
||||
FILES_ubicrc32-klibc = "${sbindir}/ubicrc32"
|
||||
FILES_ubidetach-klibc = "${sbindir}/ubidetach"
|
||||
FILES_ubiformat-klibc = "${sbindir}/ubiformat"
|
||||
FILES_ubimkvol-klibc = "${sbindir}/ubimkvol"
|
||||
FILES_ubinfo-klibc = "${sbindir}/ubinfo"
|
||||
FILES_ubinize-klibc = "${sbindir}/ubinize"
|
||||
FILES_ubirename-klibc = "${sbindir}/ubirename"
|
||||
FILES_ubirmvol-klibc = "${sbindir}/ubirmvol"
|
||||
FILES_ubirsvol-klibc = "${sbindir}/ubirsvol"
|
||||
FILES_ubiupdatevol-klibc = "${sbindir}/ubiupdatevol"
|
||||
FILES:mtdinfo-klibc = "${sbindir}/mtdinfo"
|
||||
FILES:ubiattach-klibc = "${sbindir}/ubiattach"
|
||||
FILES:ubiblock-klibc = "${sbindir}/ubiblock"
|
||||
FILES:ubicrc32-klibc = "${sbindir}/ubicrc32"
|
||||
FILES:ubidetach-klibc = "${sbindir}/ubidetach"
|
||||
FILES:ubiformat-klibc = "${sbindir}/ubiformat"
|
||||
FILES:ubimkvol-klibc = "${sbindir}/ubimkvol"
|
||||
FILES:ubinfo-klibc = "${sbindir}/ubinfo"
|
||||
FILES:ubinize-klibc = "${sbindir}/ubinize"
|
||||
FILES:ubirename-klibc = "${sbindir}/ubirename"
|
||||
FILES:ubirmvol-klibc = "${sbindir}/ubirmvol"
|
||||
FILES:ubirsvol-klibc = "${sbindir}/ubirsvol"
|
||||
FILES:ubiupdatevol-klibc = "${sbindir}/ubiupdatevol"
|
||||
|
||||
Reference in New Issue
Block a user