Replace base_contains with bb.utils.contains
base_contains is marked as deprecated and the build log outputs lots of lines stating so.
This commit is contained in:
parent
7990e01fcd
commit
8ef336e223
|
@ -12,4 +12,4 @@ activate_systemd_bsc() {
|
||||||
ln -sf ${systemd_system_unitdir}/osmo-bsc.service ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/
|
ln -sf ${systemd_system_unitdir}/osmo-bsc.service ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/
|
||||||
}
|
}
|
||||||
|
|
||||||
IMAGE_PREPROCESS_COMMAND += "${@base_contains('DISTRO_FEATURES','systemd','activate_systemd_bsc','activate_bsc',d)}; "
|
IMAGE_PREPROCESS_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES','systemd','activate_systemd_bsc','activate_bsc',d)}; "
|
||||||
|
|
|
@ -9,4 +9,4 @@ activate_systemd_nitb() {
|
||||||
ln -sf ${systemd_system_unitdir}/osmo-nitb.service ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/
|
ln -sf ${systemd_system_unitdir}/osmo-nitb.service ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/
|
||||||
}
|
}
|
||||||
|
|
||||||
IMAGE_PREPROCESS_COMMAND += "${@base_contains('DISTRO_FEATURES','systemd','activate_systemd_nitb','activate_nitb',d)}; "
|
IMAGE_PREPROCESS_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES','systemd','activate_systemd_nitb','activate_nitb',d)}; "
|
||||||
|
|
|
@ -26,10 +26,10 @@ PACKAGECONFIG[idn] = ",,libidn"
|
||||||
PACKAGECONFIG[conntrack] = ",,libnetfilter-conntrack"
|
PACKAGECONFIG[conntrack] = ",,libnetfilter-conntrack"
|
||||||
PACKAGECONFIG[lua] = ",,lua"
|
PACKAGECONFIG[lua] = ",,lua"
|
||||||
EXTRA_OEMAKE = "\
|
EXTRA_OEMAKE = "\
|
||||||
'COPTS=${@base_contains('PACKAGECONFIG', 'dbus', '-DHAVE_DBUS', '', d)} \
|
'COPTS=${@bb.utils.contains('PACKAGECONFIG', 'dbus', '-DHAVE_DBUS', '', d)} \
|
||||||
${@base_contains('PACKAGECONFIG', 'idn', '-DHAVE_IDN', '', d)} \
|
${@bb.utils.contains('PACKAGECONFIG', 'idn', '-DHAVE_IDN', '', d)} \
|
||||||
${@base_contains('PACKAGECONFIG', 'conntrack', '-DHAVE_CONNTRACK', '', d)} \
|
${@bb.utils.contains('PACKAGECONFIG', 'conntrack', '-DHAVE_CONNTRACK', '', d)} \
|
||||||
${@base_contains('PACKAGECONFIG', 'lua', '-DHAVE_LUASCRIPT', '', d)}' \
|
${@bb.utils.contains('PACKAGECONFIG', 'lua', '-DHAVE_LUASCRIPT', '', d)}' \
|
||||||
'CFLAGS=${CFLAGS}' \
|
'CFLAGS=${CFLAGS}' \
|
||||||
'LDFLAGS=${LDFLAGS}' \
|
'LDFLAGS=${LDFLAGS}' \
|
||||||
"
|
"
|
||||||
|
@ -54,7 +54,7 @@ do_install () {
|
||||||
|
|
||||||
install -m 0755 ${S}/contrib/wrt/dhcp_release ${D}${bindir}
|
install -m 0755 ${S}/contrib/wrt/dhcp_release ${D}${bindir}
|
||||||
|
|
||||||
if [ "${@base_contains('PACKAGECONFIG', 'dbus', 'dbus', '', d)}" != "" ]; then
|
if [ "${@bb.utils.contains('PACKAGECONFIG', 'dbus', 'dbus', '', d)}" != "" ]; then
|
||||||
install -d ${D}${sysconfdir}/dbus-1/system.d
|
install -d ${D}${sysconfdir}/dbus-1/system.d
|
||||||
install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/
|
install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -3,7 +3,7 @@ HOMEPAGE = "http://openvpn.sourceforge.net"
|
||||||
SECTION = "console/network"
|
SECTION = "console/network"
|
||||||
LICENSE = "GPLv2"
|
LICENSE = "GPLv2"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=5aac200199fde47501876cba7263cb0c"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=5aac200199fde47501876cba7263cb0c"
|
||||||
DEPENDS = "lzo openssl iproute2 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
|
DEPENDS = "lzo openssl iproute2 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
|
||||||
|
|
||||||
inherit autotools
|
inherit autotools
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@ CFLAGS += "-fno-inline"
|
||||||
|
|
||||||
# I want openvpn to be able to read password from file (hrw)
|
# I want openvpn to be able to read password from file (hrw)
|
||||||
EXTRA_OECONF += "--enable-password-save --enable-iproute2"
|
EXTRA_OECONF += "--enable-password-save --enable-iproute2"
|
||||||
EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-plugin-auth-pam', d)}"
|
EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '--disable-plugin-auth-pam', d)}"
|
||||||
|
|
||||||
# Explicitly specify IPROUTE to bypass the configure-time check for /sbin/ip on the host.
|
# Explicitly specify IPROUTE to bypass the configure-time check for /sbin/ip on the host.
|
||||||
EXTRA_OECONF += "IPROUTE=/sbin/ip"
|
EXTRA_OECONF += "IPROUTE=/sbin/ip"
|
||||||
|
|
Loading…
Reference in New Issue