networkmanager: Depend on dhcpcd
PATCH 1/10 networkmanager: Depend on dhcpcd
dhcp-client is being removed from oe-core
--- .../networkmanager/networkmanager_1.22.14.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb +1 -1
@@ -74,7 +74,7 @@ PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,cons PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager" PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp" # Use full featured dhcp client instead of internal one -PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client" +PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcpcd" PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" PACKAGECONFIG[resolvconf] = "--with-resolvconf=${base_sbindir}/resolvconf,,,resolvconf"
Signature · 1 line
2.28.0
PATCH 2/10 packagegroup-meta-networking: Add new packages
Reorganize to have one package per line
--- .../packagegroup-meta-networking.bb | 244 ++++++++++++++---- 1 file changed, 188 insertions(+), 56 deletions(-)
meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb +188 -56
@@ -31,101 +31,233 @@ RDEPENDS_packagegroup-meta-networking = "\ " RDEPENDS_packagegroup-meta-networking-connectivity = "\ - openconnect ez-ipupdate mosquitto sethdlc crda \ - dibbler-server dibbler-client dibbler-requestor dibbler-relay \ - libdnet ufw civetweb freeradius kea daq \ - mbedtls relayd snort dhcpcd rdate vlan vpnc \ - inetutils wolfssl lftp miniupnpd networkmanager \ - networkmanager-openvpn rdist nanomsg python3-networkmanager \ + crda \ + daq \ + adcli \ ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth x11", "blueman", "", d)} \ + cannelloni \ + civetweb \ + dhcpcd \ + libdnet \ + dibbler-client \ + dibbler-relay \ + dibbler-server \ + kea \ + relayd \ + lftp \ + sethdlc \ + snort \ + ufw \ + vlan \ + vpnc \ + ez-ipupdate \ + firewalld \ + freeradius \ + mbedtls \ + miniupnpd \ + mosquitto \ + nanomsg \ + nng \ + netplan \ + networkmanager-openvpn \ + networkmanager \ + openconnect \ + python3-networkmanager \ + rdate \ + rdist \ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "samba", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "pam", "samba", "", d)} \ - " + wolfssl \ + autossh \ + bearssl \ +" RDEPENDS_packagegroup-meta-networking-connectivity_remove_libc-musl = "rdist" RDEPENDS_packagegroup-meta-networking-daemons = "\ - ippool radvd autofs keepalived proftpd openhpi lldpd \ - ptpd igmpproxy opensaf squid \ - atftp postfix iscsi-initiator-utils vsftpd cyrus-sasl \ - pure-ftpd vblade tftp-hpa ncftp \ + atftp \ + autofs \ + cyrus-sasl \ + ippool \ + iscsi-initiator-utils \ + lldpd \ + ncftp \ + igmpproxy \ + postfix \ + proftpd \ + ptpd \ + pure-ftpd \ + radvd \ + squid \ + tftp-hpa \ + tftp-hpa-server \ + vblade \ + vsftpd \ + keepalived \ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "networkd-dispatcher", "", d)} \ - " + openhpi \ + opensaf \ +" RDEPENDS_packagegroup-meta-networking-daemons_remove_libc-musl = "opensaf" RDEPENDS_packagegroup-meta-networking-devtools = "\ python3-ldap \ - " +" RDEPENDS_packagegroup-meta-networking-extended = "\ corosync \ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "dlm", "", d)} \ - " + kronosnet \ +" RDEPENDS_packagegroup-meta-networking-filter = "\ - ebtables conntrack-tools libnetfilter-queue \ - libnetfilter-conntrack libnetfilter-cthelper libnetfilter-acct \ - libnetfilter-cttimeout libnetfilter-log nfacct \ - arno-iptables-firewall libnftnl nftables \ + libnftnl \ + conntrack-tools \ + ebtables \ + libnetfilter-acct \ + libnetfilter-conntrack \ + libnetfilter-cthelper \ + libnetfilter-cttimeout \ + libnetfilter-log \ + libnetfilter-queue \ libnfnetlink \ - " + arno-iptables-firewall \ + nfacct \ + nftables \ +" RDEPENDS_packagegroup-meta-networking-irc = "\ + weechat \ znc \ - " +" RDEPENDS_packagegroup-meta-networking-kernel = "\ wireguard-tools \ - " +" RDEPENDS_packagegroup-meta-networking-netkit = "\ - netkit-rwho-client netkit-rwho-server netkit-rsh-client netkit-rsh-server \ - netkit-telnet netkit-tftp-client netkit-tftp-server \ - netkit-ftp netkit-rpc \ + netkit-rwho-client \ + netkit-rwho-server \ + netkit-rsh-client \ + netkit-rsh-server \ + netkit-telnet \ + netkit-tftp-client \ + netkit-tftp-server \ + netkit-ftp \ + netkit-rpc \ " RDEPENDS_packagegroup-meta-networking-netkit_remove_libc-musl = " \ netkit-rsh-client netkit-rsh-server netkit-telnet" RDEPENDS_packagegroup-meta-networking-protocols = "\ - tsocks freediameter xl2tpd babeld mdns net-snmp \ - quagga pptp-linux zeroconf nopoll openflow rp-pppoe \ - radiusclient-ng openl2tp usrsctp \ + babeld \ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "dante", "", d)} \ - " + freediameter \ + net-snmp \ + openflow \ + openflow \ + openl2tp \ + mdns \ + nopoll \ + quagga \ + radiusclient-ng \ + tsocks \ + openlldp \ + zeroconf \ + pptp-linux \ + rp-pppoe \ + usrsctp \ + xl2tpd \ +" RDEPENDS_packagegroup-meta-networking-protocols_remove_libc-musl = "mdns" RDEPENDS_packagegroup-meta-networking-support = "\ - ncp ndisc6 mtr tinyproxy ssmping ntp \ - wpan-tools bridge-utils ifenslave celt051 pimd \ - nbd-client nbd-server nbd-trdump \ - phytool fwknop htpdate tcpreplay \ - traceroute geoip-perl geoip geoipupdate esmtp \ - libtdb netcf dnsmasq curlpp openipmi drbd-utils \ - tunctl dovecot ipvsadm stunnel chrony spice-protocol \ - usbredir ntop wireshark tnftp lksctp-tools \ - cim-schema-docs cim-schema-final cim-schema-exper \ - libmemcached smcroute libtevent ipcalc uftp \ - ntimed linux-atm ssmtp openvpn rdma-core \ - iftop aoetools tcpslice tcpdump libtalloc memcached nuttcp netcat \ - netcat-openbsd fetchmail yp-tools ypbind-mt yp-tools \ - arptables macchanger nghttp2 strongswan fping \ - libesmtp cifs-utils open-isns \ + aoetools \ + arptables \ + bridge-utils \ + celt051 \ + cim-schema-docs \ + cim-schema-final \ + cifs-utils \ + dnsmasq \ + curlpp \ + drbd-utils \ + dovecot \ + fping \ + esmtp \ + fetchmail \ + geoip-perl \ + geoip \ + geoipupdate \ + fwknop \ + htpdate \ + iftop \ + ifmetric \ + ipvsadm \ + libesmtp \ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "libldb", "", d)} \ + libmemcached \ + libtalloc \ + ipcalc \ + libtevent \ + linux-atm \ + lksctp-tools \ + memcached \ + ifenslave \ + netcat \ + netcat-openbsd \ + libtdb \ ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "non-commercial", "netperf", "", d)} \ - ${@bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 x86-64", "spice", "", d)} \ - " - - -RDEPENDS_packagegroup-meta-networking-support_remove_mipsarch = "spice-protocol" -RDEPENDS_packagegroup-meta-networking-support_remove_mips64 = "spice-protocol" -RDEPENDS_packagegroup-meta-networking-support_remove_mips64el = "spice-protocol" -RDEPENDS_packagegroup-meta-networking-support_remove_powerpc = "spice-protocol" -RDEPENDS_packagegroup-meta-networking-support_remove_riscv64 = "spice-protocol" -RDEPENDS_packagegroup-meta-networking-support_remove_riscv32 = "spice-protocol" -RDEPENDS_packagegroup-meta-networking-support_remove_armv5 = "spice-protocol" -RDEPENDS_packagegroup-meta-networking-support_remove_aarch64 = "spice-protocol memcached" + yp-tools \ + ypbind-mt \ + yp-tools \ + mtr \ + ntp ntpdate sntp ntpdc ntpq ntp-tickadj ntp-utils \ + nbd-client \ + nbd-server \ + nbd-trdump \ + openvpn \ + macchanger \ + nbdkit \ + ssmping \ + libowfat \ + ncp \ + strongswan \ + ndisc6 \ + tcpdump \ + tcpslice \ + netcf \ + nghttp2 \ + tnftp \ + traceroute \ + tunctl \ + wireshark \ + ntop \ + nuttcp \ + nvmetcli \ + open-isns \ + openipmi \ + phytool \ + pimd \ + ruli \ + smcroute \ + ${@bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 x86-64", "spice-protocol spice", "", d)} \ + usbredir \ + ssmtp \ + stunnel \ + rdma-core \ + tcpreplay \ + tinyproxy \ + uftp \ + unbound \ + wpan-tools \ + ettercap \ +" +RDEPENDS_packagegroup-meta-networking-support_remove_mipsarch = "memcached" EXCLUDE_FROM_WORLD = "1" +# Empty packages, only devel headers and libs +# nngpp +# Use ntp and not chrony or ntimed
Signature · 1 line
2.28.0
PATCH 3/10 bearssl: fix GNU_HASH link error
In reply to Khem RajFixes
No GNU_HASH in the ELF binary /mnt/b/yoe/master/build/tmp/work/cortexa57-yoe-linux/bearssl/0.6-r0/packages-split/bearssl/usr/lib/libbearssl.so.6.0.0, didn't pass LDFLAGS? [ldflag s]
--- ...LDFLAGS-when-building-shared-objects.patch | 32 +++++++++++++++++++ .../bearssl/bearssl_0.6.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta-networking/recipes-connectivity/bearssl/bearssl/0001-make-Pass-LDFLAGS-when-building-shared-objects.patch
meta-networking/recipes-connectivity/bearssl/bearssl/0001-make-Pass-LDFLAGS-when-building-shared-objects.patch new file +32 -0
@@ -0,0 +1,32 @@ +From 9515448761739d6186e7d07da5b47e368753528c Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Tue, 1 Sep 2020 11:34:33 -0700 +Subject: [PATCH] make: Pass LDFLAGS when building shared objects + +OE passes flags like hash-style via LDFLAGS which alters the linker +defaults, its important to have LDFLAGS in link step even if compiler +driver is used to do linking + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <[email protected]> +--- + mk/Rules.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mk/Rules.mk b/mk/Rules.mk +index b480bd6..db65125 100644 +--- a/mk/Rules.mk ++++ b/mk/Rules.mk +@@ -344,7 +344,7 @@ $(BEARSSLLIB): $(OBJDIR) $(OBJ) + $(AR) $(ARFLAGS) $(AROUT)$(BEARSSLLIB) $(OBJ) + + $(BEARSSLDLL): $(OBJDIR) $(OBJ) +- $(LDDLL) $(LDDLLFLAGS) $(LDDLLOUT)$(BEARSSLDLL) $(OBJ) ++ $(LDDLL) $(LDDLLFLAGS) $(LDFLAGS) $(LDDLLOUT)$(BEARSSLDLL) $(OBJ) + + $(BRSSL): $(BEARSSLLIB) $(OBJBRSSL) + $(LD) $(LDFLAGS) $(LDOUT)$(BRSSL) $(OBJBRSSL) $(BEARSSLLIB) +-- +2.28.0 +
meta-networking/recipes-connectivity/bearssl/bearssl_0.6.bb +1 -0
@@ -27,6 +27,7 @@ SRCREV = "8ef7680081c61b486622f2d983c0d3d21e83caad" SRC_URI = "git://www.bearssl.org/git/BearSSL;protocol=https;nobranch=1 \ file://0001-conf-Unix.mk-remove-fixed-command-definitions.patch \ file://0002-test-test_x509.c-fix-potential-overflow-issue.patch \ + file://0001-make-Pass-LDFLAGS-when-building-shared-objects.patch \ " # without compile errors like
Signature · 1 line
2.28.0
PATCH 4/10 autossh: Depend on ssh instead of hardcoding openssh
In reply to Khem RajThis helps it to use dropbear
--- meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb +1 -1
@@ -8,7 +8,7 @@ SRC_URI = "https://www.harding.motd.ca/autossh/${BP}.tgz" SRC_URI[md5sum] = "2b804bc1bf6d2f2afaa526d02df7c0a2" SRC_URI[sha256sum] = "5fc3cee3361ca1615af862364c480593171d0c54ec156de79fc421e31ae21277" -RDEPENDS_${PN} = "openssh" +RDEPENDS_${PN} = "ssh" CFLAGS_prepend = "-I${WORKDIR}/build "
Signature · 1 line
2.28.0
PATCH 5/10 quagga,pimd: Use update-alternatives for pimd
In reply to Khem Rajpimd is provided by both quagga and pimd, prefer quagga over pimd when both are in image
--- meta-networking/recipes-protocols/quagga/quagga.inc | 6 +++++- meta-networking/recipes-support/pimd/pimd_2.3.2.bb | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-)
meta-networking/recipes-protocols/quagga/quagga.inc +5 -1
@@ -40,7 +40,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" PACKAGECONFIG[cap] = "--enable-capabilities,--disable-capabilities,libcap" PACKAGECONFIG[pam] = "--with-libpam, --without-libpam, libpam" -inherit autotools update-rc.d useradd systemd pkgconfig multilib_header +inherit autotools update-rc.d useradd systemd pkgconfig multilib_header update-alternatives CFLAGS += "-fcommon"
@@ -237,3 +237,7 @@ pkg_prerm_${PN}-ripngd () { pkg_prerm_${PN}-isisd () { ${sysconfdir}/init.d/quagga stop isisd } + +ALTERNATIVE_${PN} = "pimd" +ALTERNATIVE_LINK_NAME[pimd] = "${sbindir}/pimd" +
meta-networking/recipes-support/pimd/pimd_2.3.2.bb +5 -1
@@ -12,9 +12,13 @@ SRC_URI[sha256sum] = "c77a9812751f114490a28a6839b16aac8b020c8d9fd6aa22bf3880c054 EXTRA_OECONF_append_libc-musl = " --embedded-libc" -inherit autotools-brokensep +inherit autotools-brokensep update-alternatives do_configure() { oe_runconf } +ALTERNATIVE_PRIORITY = "100" + +ALTERNATIVE_${PN} = "pimd" +ALTERNATIVE_LINK_NAME[pimd] = "${sbindir}/pimd"
Signature · 1 line
2.28.0
PATCH 6/10 netkit-rpc: Use update alternatives for rpcinfo
In reply to Khem RajThis helps it live along rpcbind
--- .../recipes-netkit/netkit-rpc/netkit-rpc_0.17.bb | 7 +++++++ 1 file changed, 7 insertions(+)
meta-networking/recipes-netkit/netkit-rpc/netkit-rpc_0.17.bb +7 -0
@@ -11,6 +11,9 @@ SRC_URI = "http://sources.openembedded.org/${BPN}-${PV}.tar.gz \ " SRC_URI[md5sum] = "67212720482ea1aea9182a98653a9642" SRC_URI[sha256sum] = "421d63b414162237a72867061f1bd3e3752a0d962cd5d30b5e933ddad8a14d3b" + +inherit update-alternatives + CFLAGS += "-I${STAGING_INCDIR}/tirpc" LIBS += "-ltirpc"
@@ -42,3 +45,7 @@ do_install () { 'BINDIR=${bindir}' 'SBINDIR=${sbindir}' \ 'MANDIR=${mandir}' install } +ALTERNATIVE_PRIORITY = "100" + +ALTERNATIVE_${PN} = "rpcinfo" +ALTERNATIVE_LINK_NAME[rpcinfo] = "${bindir}/rpcinfo"
Signature · 1 line
2.28.0
PATCH 7/10 ssmtp: Use update alternatives for conflicts with esmtp
In reply to Khem Raj--- .../recipes-support/ssmtp/ssmtp_2.64.bb | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb +14 -1
@@ -12,7 +12,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/s/${BPN}/${BPN}_${PV}.orig.tar.bz2 \ SRC_URI[md5sum] = "65b4e0df4934a6cd08c506cabcbe584f" SRC_URI[sha256sum] = "22c37dc90c871e8e052b2cab0ad219d010fa938608cd66b21c8f3c759046fa36" -inherit autotools +inherit autotools update-alternatives PACKAGECONFIG ?= "ssl ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
@@ -33,3 +33,16 @@ do_install_append () { ln -s ssmtp ${D}${sbindir}/newaliases ln -s ssmtp ${D}${sbindir}/mailq } + +ALTERNATIVE_PRIORITY_${PN} = "100" + +ALTERNATIVE_${PN} = "mailq newalias sendmail" +ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail" +ALTERNATIVE_LINK_NAME[newalias] = "${sbindir}/newalias" +ALTERNATIVE_LINK_NAME[mailq] = "${sbindir}/mailq" + +ALTERNATIVE_PRIORITY_${PN}-doc = "100" +ALTERNATIVE_${PN}-doc += "mailq.1 newaliases.1 sendmail.1" +ALTERNATIVE_LINK_NAME[mailq.1] = "${mandir}/man1/mailq.1" +ALTERNATIVE_LINK_NAME[newaliases.1] = "${mandir}/man1/newaliases.1" +ALTERNATIVE_LINK_NAME[sendmail.1] = "${mandir}/man1/sendmail.1"
Signature · 1 line
2.28.0
Re: [oe] [meta-networking][PATCH 07/10] ssmtp: Use update alternatives for conflicts with esmtp
In my build I don't have mailq, sendmail, newaliases as man pages, but binaries in sbindir (and the sbinbinary is called newaliases, not newalias)
tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/ tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/usr tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/usr/share tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/usr/share/man tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/usr/share/man/man8 tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/usr/share/man/man8/ssmtp.8 tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/usr/sbin tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/usr/sbin/mailq tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/usr/sbin/sendmail tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/usr/sbin/newaliases tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/usr/sbin/ssmtp tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/etc tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/etc/ssmtp tmp-glibc/work/core2-64-oe-linux/ssmtp/2.64-r0/image/etc/ssmtp/revaliases
this added u-a is causing following warnings:
WARNING: ssmtp-2.64-r0 do_package: ssmtp: alternative target (/usr/share/man/man1/mailq.1 or /usr/share/man/man1/mailq.1.ssmtp) does not exist, skipping...
WARNING: ssmtp-2.64-r0 do_package: ssmtp: alternative target (/usr/share/man/man1/newaliases.1 or /usr/share/man/man1/newaliases.1.ssmtp) does not exist, skipping...
WARNING: ssmtp-2.64-r0 do_package: ssmtp: alternative target (/usr/share/man/man1/sendmail.1 or /usr/share/man/man1/sendmail.1.ssmtp) does not exist, skipping...
WARNING: ssmtp-2.64-r0 do_package: ssmtp: alternative target (/usr/sbin/newalias or /usr/sbin/newalias.ssmtp) does not exist, skipping...
WARNING: ssmtp-2.64-r0 do_package: ssmtp: NOT adding alternative provide /usr/share/man/man1/mailq.1: /usr/share/man/man1/mailq.1.ssmtp does not exist
WARNING: ssmtp-2.64-r0 do_package: ssmtp: NOT adding alternative provide /usr/share/man/man1/newaliases.1: /usr/share/man/man1/newaliases.1.ssmtp does not exist
WARNING: ssmtp-2.64-r0 do_package: ssmtp: NOT adding alternative provide /usr/share/man/man1/sendmail.1: /usr/share/man/man1/sendmail.1.ssmtp does not exist
WARNING: ssmtp-2.64-r0 do_package: ssmtp: NOT adding alternative provide /usr/sbin/newalias: /usr/sbin/newalias.ssmtp does not exist
WARNING: ssmtp-2.64-r0 do_package: ssmtp: alt_link == alt_target:/usr/share/man/man1/mailq.1 == /usr/share/man/man1/mailq.1
WARNING: ssmtp-2.64-r0 do_package: ssmtp: alt_link == alt_target:/usr/share/man/man1/newaliases.1 == /usr/share/man/man1/newaliases.1
WARNING: ssmtp-2.64-r0 do_package: ssmtp: alt_link == alt_target:/usr/share/man/man1/sendmail.1 == /usr/share/man/man1/sendmail.1
WARNING: ssmtp-2.64-r0 do_package: ssmtp: alt_link == alt_target:/usr/sbin/newalias == /usr/sbin/newalias
I'll send a fix adjusting this shortly, but please check if it produces different files for you for some reason.
Quoted 43 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- .../recipes-support/ssmtp/ssmtp_2.64.bb | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb +0
-0@@ -12,7 +12,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/s/${BPN}/${BPN}_${PV}.orig.tar.bz2 \ SRC_URI[md5sum] = "65b4e0df4934a6cd08c506cabcbe584f" SRC_URI[sha256sum] ="
22c37dc90c871e8e052b2cab0ad219d010fa938608cd66b21c8f3c759046fa36"meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb +14
-2-inherit autotools +inherit autotools update-alternatives PACKAGECONFIG ?= "ssl ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"@@ -33,3 +33,16 @@ do_install_append () { ln -s ssmtp ${D}${sbindir}/newaliases ln -s ssmtp ${D}${sbindir}/mailq } + +ALTERNATIVE_PRIORITY_${PN} = "100" + +ALTERNATIVE_${PN} = "mailq newalias sendmail" +ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail" +ALTERNATIVE_LINK_NAME[newalias] = "${sbindir}/newalias" +ALTERNATIVE_LINK_NAME[mailq] = "${sbindir}/mailq" + +ALTERNATIVE_PRIORITY_${PN}-doc = "100" +ALTERNATIVE_${PN}-doc += "mailq.1 newaliases.1 sendmail.1" +ALTERNATIVE_LINK_NAME[mailq.1] = "${mandir}/man1/mailq.1" +ALTERNATIVE_LINK_NAME[newaliases.1] = "${mandir}/man1/newaliases.1" +ALTERNATIVE_LINK_NAME[sendmail.1] = "${mandir}/man1/sendmail.1" --2.28.0
PATCH 8/10 netkit-rwho: Use update-alternatives for tftp
In reply to Khem RajSo it can live along other providers
--- .../recipes-netkit/netkit-tftp/netkit-tftp_0.17.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
meta-networking/recipes-netkit/netkit-tftp/netkit-tftp_0.17.bb +5 -1
@@ -16,7 +16,7 @@ SRC_URI[archive.sha256sum] = "3a43c0010d4e61f412563fd83769d4667d8b8e82903526d21c SRC_URI[patch18.md5sum] = "cb29e7a33dd85105ba6e6ec4f971e42c" SRC_URI[patch18.sha256sum] = "092437d27b4fa88c044ef6290372fee5ce06d223607f0e22a6e527065c8930e7" -inherit autotools-brokensep +inherit autotools-brokensep update-alternatives do_configure () { ./configure --prefix=${prefix}
@@ -53,3 +53,7 @@ FILES_${PN}-dbg = "${prefix}/src/debug \ ${bindir}/.debug ${sbindir}/.debug" RDEPENDS_${PN}-server = "tcp-wrappers xinetd" + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_${PN}-client = "tftp" +ALTERNATIVE_LINK_NAME[tftp] = "${bindir}/tftp"
Signature · 1 line
2.28.0
PATCH 9/10 netkit-ftp: Use update-alternatives for ftp
In reply to Khem RajSo it can live with other providers
--- .../recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb +5 -1
@@ -16,7 +16,7 @@ SRC_URI[archive.sha256sum] = "61c913299b81a4671ff089aac821329f7db9bc111aa812993d SRC_URI[patch31.md5sum] = "93d71e28ce70df69e080c7f90da63cac" SRC_URI[patch31.sha256sum] = "4edd46a32d70daa7ba00f0ebf0118dc5d17dff23d6e46aa21a2722be2e22d1c1" -inherit autotools-brokensep +inherit autotools-brokensep update-alternatives CLEANBROKEN = "1"
@@ -47,3 +47,7 @@ FILES_${PN}-dbg = "${prefix}/src/debug \ ${bindir}/.debug" RDEPENDS_${PN} = "readline" + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_${PN} = "ftp" +ALTERNATIVE_LINK_NAME[ftp] = "${bindir}/ftp"
Signature · 1 line
2.28.0
PATCH 10/10 netkit-rwho: Convert to ontarget postinst
In reply to Khem RajStarting the service is something to be done when its booted on target
--- meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb +1 -2
@@ -82,8 +82,7 @@ do_install () { mkdir -p -m 755 ${D}${localstatedir}/spool/rwho chown -R rwhod ${D}${localstatedir}/spool/rwho } - -pkg_postinst_${PN}-server() { +pkg_postinst_ontarget_${PN}-server() { ${sysconfdir}/init.d/rwhod start }
Signature · 1 line
2.28.0