* [PATCH 02/16] ifupdown: update 0.8.22 -> 0.8.35
2019-12-19 13:22 [PATCH 01/16] resolvconf: update to 1.80 Alexander Kanavin
@ 2019-12-19 13:22 ` Alexander Kanavin
2019-12-19 17:03 ` Khem Raj
2019-12-19 13:22 ` [PATCH 03/16] ovmf: update to 201911 Alexander Kanavin
` (14 subsequent siblings)
15 siblings, 1 reply; 23+ messages in thread
From: Alexander Kanavin @ 2019-12-19 13:22 UTC (permalink / raw)
To: openembedded-core
Remove inet-6-.defn-fix-inverted-checks-for-loopback.patch as
it is difficult to rebase and not clear if still necessary.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...efn-fix-inverted-checks-for-loopback.patch | 403 ------------------
...{ifupdown_0.8.22.bb => ifupdown_0.8.35.bb} | 11 +-
2 files changed, 5 insertions(+), 409 deletions(-)
delete mode 100644 meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch
rename meta/recipes-core/ifupdown/{ifupdown_0.8.22.bb => ifupdown_0.8.35.bb} (83%)
diff --git a/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch b/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch
deleted file mode 100644
index 5b0d51d736f..00000000000
--- a/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch
+++ /dev/null
@@ -1,403 +0,0 @@
-From 6fce99c9e42cbacde1855473b745ca1fded3fbf7 Mon Sep 17 00:00:00 2001
-From: "Maxin B. John" <maxin.john@intel.com>
-Date: Wed, 21 Dec 2016 15:32:07 +0200
-Subject: [PATCH 2/2] inet[6].defn: fix inverted checks for loopback
-
-Compared to the hurd link.defn for loopback, we see these
-are inverted, meaning that you would only be able to configure
-a loopback device that was _not_ named "lo" (unlikely to exist).
-
-The result was that we'd update /run/network/ifstate for "lo"
-but never actually do anything for up/down, as shown below:
-
-root@localhost:~# ifconfig -s
-Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg
-eth0 1500 0 7736329 0 2016 0 5289422 0 0 0 BMRU
-lo 65536 0 18 0 0 0 18 0 0 0 LRU
-root@localhost:~# ifdown lo
-root@localhost:~# echo $?
-0
-root@localhost:~# ifconfig -s
-Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg
-eth0 1500 0 7736406 0 2016 0 5289455 0 0 0 BMRU
-lo 65536 0 18 0 0 0 18 0 0 0 LRU
-root@localhost:~# ifconfig lo down
-root@localhost:~# ifconfig -s
-Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg
-eth0 1500 0 7736474 0 2016 0 5289481 0 0 0 BMRU
-root@localhost:~#
-
-Also reverted the commit:
-commit 80b878497663dae08f70b4d3cffe127b57a3cfc
-which uses absolute paths to binaries called by ifup/ifdown.
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-Signed-off-by: Maxin B. John <maxin.john@intel.com>
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- inet.defn | 134 +++++++++++++++++++++++++++---------------------------
- 1 file changed, 67 insertions(+), 67 deletions(-)
-
-diff --git a/inet.defn b/inet.defn
-index 182b56b..31067bc 100644
---- a/inet.defn
-+++ b/inet.defn
-@@ -6,10 +6,10 @@ method loopback
- This method may be used to define the IPv4 loopback interface.
-
- up
-- /bin/ip link set dev %iface% up if (!iface_is_lo())
-+ ip link set dev %iface% up if (!iface_is_lo())
-
- down
-- /bin/ip link set dev %iface% down if (!iface_is_lo())
-+ ip link set dev %iface% down if (!iface_is_lo())
-
- method static
- description
-@@ -36,17 +36,17 @@ method static
- broadcast compute_v4_broadcast
-
- up
-- /bin/ip addr add %address%[[/%netmask%]] [[broadcast %broadcast%]] \
-+ ip addr add %address%[[/%netmask%]] [[broadcast %broadcast%]] \
- [[peer %pointopoint%]] [[scope %scope%]] dev %iface% label %iface%
-- /bin/ip link set dev %iface% [[mtu %mtu%]] [[address %hwaddress%]] up
-+ ip link set dev %iface% [[mtu %mtu%]] [[address %hwaddress%]] up
-
-- [[ /bin/ip route add default via %gateway% [[metric %metric%]] dev %iface% onlink ]]
-+ [[ ip route add default via %gateway% [[metric %metric%]] dev %iface% onlink ]]
-
- down
-- [[ /bin/ip route del default via %gateway% [[metric %metric%]] dev %iface% 2>&1 1>/dev/null || true ]]
-- /bin/ip addr del %address%[[/%netmask%]] [[broadcast %broadcast%]] \
-+ [[ ip route del default via %gateway% [[metric %metric%]] dev %iface% 2>&1 1>/dev/null || true ]]
-+ ip addr del %address%[[/%netmask%]] [[broadcast %broadcast%]] \
- [[peer %pointopoint%]] [[scope %scope%]] dev %iface% label %iface%
-- /bin/ip link set dev %iface% down \
-+ ip link set dev %iface% down \
- if (iface_is_link())
-
- method manual
-@@ -63,12 +63,12 @@ method manual
- hwaddress cleanup_hwaddress
-
- up
-- [[/bin/ip link set dev %iface% mtu %mtu%]]
-- [[/bin/ip link set dev %iface% address %hwaddress%]]
-- /bin/ip link set dev %iface% up 2>/dev/null || true
-+ [[ip link set dev %iface% mtu %mtu%]]
-+ [[ip link set dev %iface% address %hwaddress%]]
-+ ip link set dev %iface% up 2>/dev/null || true
-
- down
-- /bin/ip link set dev %iface% down 2>/dev/null || true \
-+ ip link set dev %iface% down 2>/dev/null || true \
- if (iface_is_link() && !do_all)
-
- method dhcp
-@@ -93,33 +93,33 @@ method dhcp
- hwaddress cleanup_hwaddress
-
- up
-- [[/bin/ip link set dev %iface% address %hwaddress%]]
-- /sbin/dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
-+ [[ip link set dev %iface% address %hwaddress%]]
-+ dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
- [[-e IF_METRIC=%metric%]] \
- if (execable("/sbin/dhclient"))
-- /sbin/pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \
-+ pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \
- elsif (execable("/sbin/pump"))
-- /sbin/udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-x hostname:%hostname%]] \
-+ udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-x hostname:%hostname%]] \
- elsif (execable("/sbin/udhcpc"))
-- /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
-+ dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
- [[-l %leasetime%]] [[-m %metric%]] %iface% \
- elsif (execable("/sbin/dhcpcd"))
- echo 'No DHCP client software found!' >/dev/stderr; false \
- elsif (1)
-
- down
-- /sbin/dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
-+ dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
- if (execable("/sbin/dhclient"))
-- /sbin/pump -i %iface% -r \
-+ pump -i %iface% -r \
- elsif (execable("/sbin/pump"))
- if test -f /run/udhcpc.%iface%.pid; then kill -USR2 $(/bin/cat /run/udhcpc.%iface%.pid); kill -TERM $(/bin/cat /run/udhcpc.%iface%.pid); fi \
- elsif (execable("/sbin/udhcpc"))
-- /sbin/dhcpcd -k %iface% \
-+ dhcpcd -k %iface% \
- elsif (execable("/sbin/dhcpcd"))
- echo 'No DHCP client software found!' >/dev/stderr; false \
- elsif (1)
-
-- /bin/ip link set dev %iface% down \
-+ ip link set dev %iface% down \
- if (iface_is_link())
-
- method bootp
-@@ -134,11 +134,11 @@ method bootp
- whatever it really is.
-
- up
-- /sbin/bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server %server%]] \
-+ bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server %server%]] \
- [[--hwaddr %hwaddr%]] --returniffail --serverbcast
-
- down
-- /bin/ip link set dev %iface% down \
-+ ip link set dev %iface% down \
- if (iface_is_link())
-
- method tunnel
-@@ -158,13 +158,13 @@ method tunnel
- ttl time -- TTL setting
- mtu size -- MTU size
- up
-- /bin/ip tunnel add %iface% mode %mode% remote %endpoint% [[local %local%]] \
-+ ip tunnel add %iface% mode %mode% remote %endpoint% [[local %local%]] \
- [[ttl %ttl%]]
-- /bin/ip link set %iface% up [[mtu %mtu%]]
-- /bin/ip addr add %address%/%netmask% dev %iface% [[peer %dstaddr%]]
-- [[ /bin/ip route add default via %gateway% [[metric %metric%]] dev %iface% onlink ]]
-+ ip link set %iface% up [[mtu %mtu%]]
-+ ip addr add %address%/%netmask% dev %iface% [[peer %dstaddr%]]
-+ [[ ip route add default via %gateway% [[metric %metric%]] dev %iface% onlink ]]
- down
-- /bin/ip tunnel del %iface%
-+ ip tunnel del %iface%
-
- method ppp
- description
-@@ -175,9 +175,9 @@ method ppp
- unit number -- Use /number/ as the ppp unit number.
- options string -- Pass /string/ as additional options to pon.
- up
-- /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]]
-+ pon [[%provider%]] [[unit %unit%]] [[%options%]]
- down
-- /usr/bin/poff [[%provider%]]
-+ poff [[%provider%]]
-
- method wvdial
- description
-@@ -186,10 +186,10 @@ method wvdial
- options
- provider name -- Use /name/ as the provider (from /etc/wvdial.conf).
- up
-- /sbin/start-stop-daemon --start -x /usr/bin/wvdial \
-+ start-stop-daemon --start -x /usr/bin/wvdial \
- -p /run/wvdial.%iface%.pid -b -m -- [[ %provider% ]]
- down
-- /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \
-+ start-stop-daemon --stop -x /usr/bin/wvdial \
- -p /run/wvdial.%iface%.pid -s 2
-
-
-@@ -200,9 +200,9 @@ method ipv4ll
- known as APIPA or IPAC, and often colloquially referred to
- as "Zeroconf address".
- up
-- /usr/sbin/avahi-autoipd -D %iface%
-+ avahi-autoipd -D %iface%
- down
-- /usr/sbin/avahi-autoipd --kill %iface%
-+ avahi-autoipd --kill %iface%
-
- architecture kfreebsd
-
-@@ -211,11 +211,11 @@ method loopback
- This method may be used to define the IPv4 loopback interface.
-
- up
-- /sbin/ifconfig %iface% 127.0.0.1 up \
-+ ifconfig %iface% 127.0.0.1 up \
- if (!iface_is_lo())
-
- down
-- /sbin/ifconfig %iface% down \
-+ ifconfig %iface% down \
- if (!iface_is_lo())
-
- method static
-@@ -238,15 +238,15 @@ method static
- hwaddress cleanup_hwaddress
-
- up
-- [[ /sbin/ifconfig %iface% link %hwaddress%]]
-- /sbin/ifconfig %iface% %address% [[netmask %netmask%]] [[broadcast %broadcast%]] \
-+ [[ ifconfig %iface% link %hwaddress%]]
-+ ifconfig %iface% %address% [[netmask %netmask%]] [[broadcast %broadcast%]] \
- [[pointopoint %pointopoint%]] [[media %media%]] [[mtu %mtu%]] \
- up
-- [[ /sbin/route add default %gateway% ]]
-+ [[ route add default %gateway% ]]
-
- down
-- [[ /sbin/route del default %gateway% 2>&1 1>/dev/null || true ]]
-- /sbin/ifconfig %iface% down
-+ [[ route del default %gateway% 2>&1 1>/dev/null || true ]]
-+ ifconfig %iface% down
-
- method manual
- description
-@@ -279,30 +279,30 @@ method dhcp
- hwaddress cleanup_hwaddress
-
- up
-- [[/sbin/ifconfig %iface% link %hwaddress%]]
-- /sbin/dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
-+ [[ifconfig %iface% link %hwaddress%]]
-+ dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
- [[-e IF_METRIC=%metric%]] \
- if (execable("/sbin/dhclient"))
-- /sbin/udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-H %hostname%]] \
-+ udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-H %hostname%]] \
- [[-c %client%]] \
- elsif (execable("/sbin/udhcpc"))
-- /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
-+ dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
- [[-l %leasetime%]] %iface% \
- elsif (execable("/sbin/dhcpcd"))
- echo 'No DHCP client software found!' >/dev/stderr; false \
- elsif (1)
-
- down
-- /sbin/dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
-+ dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
- if (execable("/sbin/dhclient"))
- if test -f /run/udhcpc.%iface%.pid; then kill -USR2 $(/bin/cat /run/udhcpc.%iface%.pid); kill -TERM $(/bin/cat /run/udhcpc.%iface%.pid); fi \
- elsif (execable("/sbin/udhcpc"))
-- /sbin/dhcpcd -k %iface% \
-+ dhcpcd -k %iface% \
- elsif (execable("/sbin/dhcpcd"))
- echo 'No DHCP client software found!' >/dev/stderr; false \
- elsif (1)
-
-- /sbin/ifconfig %iface% down
-+ ifconfig %iface% down
-
- method bootp
- description
-@@ -316,11 +316,11 @@ method bootp
- whatever it really is.
-
- up
-- /sbin/bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server %server%]] \
-+ bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server %server%]] \
- [[--hwaddr %hwaddr%]] --returniffail --serverbcast
-
- down
-- /sbin/ifconfig %iface% down
-+ ifconfig %iface% down
-
- method ppp
- description
-@@ -331,9 +331,9 @@ method ppp
- unit number -- Use /number/ as the ppp unit number.
- options string -- Pass /string/ as additional options to pon.
- up
-- /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]]
-+ pon [[%provider%]] [[unit %unit%]] [[%options%]]
- down
-- /usr/bin/poff [[%provider%]]
-+ poff [[%provider%]]
-
- method wvdial
- description
-@@ -342,10 +342,10 @@ method wvdial
- options
- provider name -- Use /name/ as the provider (from /etc/wvdial.conf).
- up
-- /sbin/start-stop-daemon --start -x /usr/bin/wvdial \
-+ start-stop-daemon --start -x /usr/bin/wvdial \
- -p /run/wvdial.%iface%.pid -b -m -- [[ %provider% ]]
- down
-- /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \
-+ start-stop-daemon --stop -x /usr/bin/wvdial \
- -p /run/wvdial.%iface%.pid -s 2
-
-
-@@ -356,9 +356,9 @@ method ipv4ll
- known as APIPA or IPAC, and often colloquially referred to
- as "Zeroconf address".
- up
-- /usr/sbin/avahi-autoipd -D %iface%
-+ avahi-autoipd -D %iface%
- down
-- /usr/sbin/avahi-autoipd --kill %iface%
-+ avahi-autoipd --kill %iface%
- architecture hurd
-
- method loopback
-@@ -432,23 +432,23 @@ method dhcp
-
- up
- [[Warning: Option hwaddress: %hwaddress% not yet supported]]
-- /sbin/dhclient -4 -v -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases -I -df /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
-+ dhclient -4 -v -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases -I -df /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
- if (execable("/sbin/dhclient"))
-- /sbin/udhcpc -n -p /run/udhcpc.%iface///.%.pid -i %iface% [[-H %hostname%]] \
-+ udhcpc -n -p /run/udhcpc.%iface///.%.pid -i %iface% [[-H %hostname%]] \
- [[-c %client%]] \
- elsif (execable("/sbin/udhcpc"))
-- /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
-+ dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
- [[-l %leasetime%]] %iface% \
- elsif (execable("/sbin/dhcpcd"))
- echo 'No DHCP client software found!' >/dev/stderr; false \
- elsif (1)
-
- down
-- /sbin/dhclient -4 -v -r -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases -I -df /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
-+ dhclient -4 -v -r -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases -I -df /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
- if (execable("/sbin/dhclient"))
- if test -f /run/udhcpc.%iface///.%.pid; then kill -USR2 $(/bin/cat /run/udhcpc.%iface///.%.pid); kill -TERM $(/bin/cat /run/udhcpc.%iface///.%.pid); fi \
- elsif (execable("/sbin/udhcpc"))
-- /sbin/dhcpcd -k %iface% \
-+ dhcpcd -k %iface% \
- elsif (execable("/sbin/dhcpcd"))
- echo 'No DHCP client software found!' >/dev/stderr; false \
- elsif (1)
-@@ -482,9 +482,9 @@ method ppp
- unit number -- Use /number/ as the ppp unit number.
- options string -- Pass /string/ as additional options to pon.
- up
-- /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]]
-+ pon [[%provider%]] [[unit %unit%]] [[%options%]]
- down
-- /usr/bin/poff [[%provider%]]
-+ poff [[%provider%]]
-
- method wvdial
- description
-@@ -493,10 +493,10 @@ method wvdial
- options
- provider name -- Use /name/ as the provider (from /etc/wvdial.conf).
- up
-- /sbin/start-stop-daemon --start -x /usr/bin/wvdial \
-+ start-stop-daemon --start -x /usr/bin/wvdial \
- -p /run/wvdial.%iface///.%.pid -b -m -- [[ %provider% ]]
- down
-- /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \
-+ start-stop-daemon --stop -x /usr/bin/wvdial \
- -p /run/wvdial.%iface///.%.pid -s 2
-
-
-@@ -507,6 +507,6 @@ method ipv4ll
- known as APIPA or IPAC, and often colloquially referred to
- as "Zeroconf address".
- up
-- /usr/sbin/avahi-autoipd -D %iface%
-+ avahi-autoipd -D %iface%
- down
-- /usr/sbin/avahi-autoipd --kill %iface%
-+ avahi-autoipd --kill %iface%
---
-2.17.1
-
diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.22.bb b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb
similarity index 83%
rename from meta/recipes-core/ifupdown/ifupdown_0.8.22.bb
rename to meta/recipes-core/ifupdown/ifupdown_0.8.35.bb
index bd0989e8855..de8e1cf66ba 100644
--- a/meta/recipes-core/ifupdown/ifupdown_0.8.22.bb
+++ b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb
@@ -7,12 +7,11 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https \
- file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch \
- file://inet-6-.defn-fix-inverted-checks-for-loopback.patch \
- file://99_network \
- file://0001-Define-FNM_EXTMATCH-for-musl.patch \
- "
-SRCREV = "ab5a0f464e53e172316a5ca8b5dcdc49e8848999"
+ file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch \
+ file://99_network \
+ file://0001-Define-FNM_EXTMATCH-for-musl.patch \
+ "
+SRCREV = "4af76318cfc57f8e4a44d357104188666213bd4b"
S = "${WORKDIR}/git"
--
2.17.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [PATCH 02/16] ifupdown: update 0.8.22 -> 0.8.35
2019-12-19 13:22 ` [PATCH 02/16] ifupdown: update 0.8.22 -> 0.8.35 Alexander Kanavin
@ 2019-12-19 17:03 ` Khem Raj
2019-12-19 17:12 ` Alexander Kanavin
0 siblings, 1 reply; 23+ messages in thread
From: Khem Raj @ 2019-12-19 17:03 UTC (permalink / raw)
To: Alexander Kanavin, openembedded-core
On Thu, 2019-12-19 at 14:22 +0100, Alexander Kanavin wrote:
> Remove inet-6-.defn-fix-inverted-checks-for-loopback.patch as
> it is difficult to rebase and not clear if still necessary.
>
perhaps Cc the patch authors and get an opinion ?
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
> ...efn-fix-inverted-checks-for-loopback.patch | 403 ----------------
> --
> ...{ifupdown_0.8.22.bb => ifupdown_0.8.35.bb} | 11 +-
> 2 files changed, 5 insertions(+), 409 deletions(-)
> delete mode 100644 meta/recipes-core/ifupdown/files/inet-6-.defn-
> fix-inverted-checks-for-loopback.patch
> rename meta/recipes-core/ifupdown/{ifupdown_0.8.22.bb =>
> ifupdown_0.8.35.bb} (83%)
>
> diff --git a/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-
> inverted-checks-for-loopback.patch b/meta/recipes-
> core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-
> loopback.patch
> deleted file mode 100644
> index 5b0d51d736f..00000000000
> --- a/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-
> checks-for-loopback.patch
> +++ /dev/null
> @@ -1,403 +0,0 @@
> -From 6fce99c9e42cbacde1855473b745ca1fded3fbf7 Mon Sep 17 00:00:00
> 2001
> -From: "Maxin B. John" <maxin.john@intel.com>
> -Date: Wed, 21 Dec 2016 15:32:07 +0200
> -Subject: [PATCH 2/2] inet[6].defn: fix inverted checks for loopback
> -
> -Compared to the hurd link.defn for loopback, we see these
> -are inverted, meaning that you would only be able to configure
> -a loopback device that was _not_ named "lo" (unlikely to exist).
> -
> -The result was that we'd update /run/network/ifstate for "lo"
> -but never actually do anything for up/down, as shown below:
> -
> -root@localhost:~# ifconfig -s
> -Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP
> TX-OVR Flg
> -eth0 1500 0 7736329 0 2016 0
> 5289422 0 0 0 BMRU
> -lo 65536 0 18 0 0
> 0 18 0 0 0 LRU
> -root@localhost:~# ifdown lo
> -root@localhost:~# echo $?
> -0
> -root@localhost:~# ifconfig -s
> -Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP
> TX-OVR Flg
> -eth0 1500 0 7736406 0 2016
> 0 5289455 0 0 0 BMRU
> -lo 65536 0 18 0 0
> 0 18 0 0 0 LRU
> -root@localhost:~# ifconfig lo down
> -root@localhost:~# ifconfig -s
> -Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP
> TX-OVR Flg
> -eth0 1500 0 7736474 0 2016
> 0 5289481 0 0 0 BMRU
> -root@localhost:~#
> -
> -Also reverted the commit:
> -commit 80b878497663dae08f70b4d3cffe127b57a3cfc
> -which uses absolute paths to binaries called by ifup/ifdown.
> -
> -Upstream-Status: Inappropriate [OE specific]
> -
> -Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> -Signed-off-by: Maxin B. John <maxin.john@intel.com>
> -Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> ----
> - inet.defn | 134 +++++++++++++++++++++++++++----------------------
> -----
> - 1 file changed, 67 insertions(+), 67 deletions(-)
> -
> -diff --git a/inet.defn b/inet.defn
> -index 182b56b..31067bc 100644
> ---- a/inet.defn
> -+++ b/inet.defn
> -@@ -6,10 +6,10 @@ method loopback
> - This method may be used to define the IPv4 loopback interface.
> -
> - up
> -- /bin/ip link set dev %iface% up if (!iface_is_lo())
> -+ ip link set dev %iface% up if (!iface_is_lo())
> -
> - down
> -- /bin/ip link set dev %iface% down if (!iface_is_lo())
> -+ ip link set dev %iface% down if (!iface_is_lo())
> -
> - method static
> - description
> -@@ -36,17 +36,17 @@ method static
> - broadcast compute_v4_broadcast
> -
> - up
> -- /bin/ip addr add %address%[[/%netmask%]] [[broadcast
> %broadcast%]] \
> -+ ip addr add %address%[[/%netmask%]] [[broadcast %broadcast%]] \
> - [[peer %pointopoint%]] [[scope %scope%]] dev %iface% label
> %iface%
> -- /bin/ip link set dev %iface% [[mtu %mtu%]] [[address
> %hwaddress%]] up
> -+ ip link set dev %iface% [[mtu %mtu%]] [[address %hwaddress%]]
> up
> -
> -- [[ /bin/ip route add default via %gateway% [[metric %metric%]]
> dev %iface% onlink ]]
> -+ [[ ip route add default via %gateway% [[metric %metric%]] dev
> %iface% onlink ]]
> -
> - down
> -- [[ /bin/ip route del default via %gateway% [[metric %metric%]]
> dev %iface% 2>&1 1>/dev/null || true ]]
> -- /bin/ip addr del %address%[[/%netmask%]] [[broadcast
> %broadcast%]] \
> -+ [[ ip route del default via %gateway% [[metric %metric%]] dev
> %iface% 2>&1 1>/dev/null || true ]]
> -+ ip addr del %address%[[/%netmask%]] [[broadcast %broadcast%]] \
> - [[peer %pointopoint%]] [[scope %scope%]] dev %iface% label
> %iface%
> -- /bin/ip link set dev %iface% down \
> -+ ip link set dev %iface% down \
> - if (iface_is_link())
> -
> - method manual
> -@@ -63,12 +63,12 @@ method manual
> - hwaddress cleanup_hwaddress
> -
> - up
> -- [[/bin/ip link set dev %iface% mtu %mtu%]]
> -- [[/bin/ip link set dev %iface% address %hwaddress%]]
> -- /bin/ip link set dev %iface% up 2>/dev/null || true
> -+ [[ip link set dev %iface% mtu %mtu%]]
> -+ [[ip link set dev %iface% address %hwaddress%]]
> -+ ip link set dev %iface% up 2>/dev/null || true
> -
> - down
> -- /bin/ip link set dev %iface% down 2>/dev/null || true \
> -+ ip link set dev %iface% down 2>/dev/null || true \
> - if (iface_is_link() && !do_all)
> -
> - method dhcp
> -@@ -93,33 +93,33 @@ method dhcp
> - hwaddress cleanup_hwaddress
> -
> - up
> -- [[/bin/ip link set dev %iface% address %hwaddress%]]
> -- /sbin/dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf
> /var/lib/dhcp/dhclient.%iface%.leases -I -df
> /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> -+ [[ip link set dev %iface% address %hwaddress%]]
> -+ dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf
> /var/lib/dhcp/dhclient.%iface%.leases -I -df
> /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> - [[-e IF_METRIC=%metric%]] \
> - if (execable("/sbin/dhclient"))
> -- /sbin/pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \
> -+ pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \
> - elsif (execable("/sbin/pump"))
> -- /sbin/udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-x
> hostname:%hostname%]] \
> -+ udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-x
> hostname:%hostname%]] \
> - elsif (execable("/sbin/udhcpc"))
> -- /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]]
> \
> -+ dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
> - [[-l %leasetime%]] [[-m %metric%]] %iface% \
> - elsif (execable("/sbin/dhcpcd"))
> - echo 'No DHCP client software found!' >/dev/stderr; false \
> - elsif (1)
> -
> - down
> -- /sbin/dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf
> /var/lib/dhcp/dhclient.%iface%.leases -I -df
> /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> -+ dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf
> /var/lib/dhcp/dhclient.%iface%.leases -I -df
> /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> - if (execable("/sbin/dhclient"))
> -- /sbin/pump -i %iface% -r \
> -+ pump -i %iface% -r \
> - elsif (execable("/sbin/pump"))
> - if test -f /run/udhcpc.%iface%.pid; then kill -USR2 $(/bin/cat
> /run/udhcpc.%iface%.pid); kill -TERM $(/bin/cat
> /run/udhcpc.%iface%.pid); fi \
> - elsif (execable("/sbin/udhcpc"))
> -- /sbin/dhcpcd -k %iface% \
> -+ dhcpcd -k %iface% \
> - elsif (execable("/sbin/dhcpcd"))
> - echo 'No DHCP client software found!' >/dev/stderr; false \
> - elsif (1)
> -
> -- /bin/ip link set dev %iface% down \
> -+ ip link set dev %iface% down \
> - if (iface_is_link())
> -
> - method bootp
> -@@ -134,11 +134,11 @@ method bootp
> - whatever it really is.
> -
> - up
> -- /sbin/bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server
> %server%]] \
> -+ bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server
> %server%]] \
> - [[--hwaddr %hwaddr%]] --returniffail --serverbcast
> -
> - down
> -- /bin/ip link set dev %iface% down \
> -+ ip link set dev %iface% down \
> - if (iface_is_link())
> -
> - method tunnel
> -@@ -158,13 +158,13 @@ method tunnel
> - ttl time -- TTL setting
> - mtu size -- MTU size
> - up
> -- /bin/ip tunnel add %iface% mode %mode% remote %endpoint%
> [[local %local%]] \
> -+ ip tunnel add %iface% mode %mode% remote %endpoint% [[local
> %local%]] \
> - [[ttl %ttl%]]
> -- /bin/ip link set %iface% up [[mtu %mtu%]]
> -- /bin/ip addr add %address%/%netmask% dev %iface% [[peer
> %dstaddr%]]
> -- [[ /bin/ip route add default via %gateway% [[metric %metric%]]
> dev %iface% onlink ]]
> -+ ip link set %iface% up [[mtu %mtu%]]
> -+ ip addr add %address%/%netmask% dev %iface% [[peer %dstaddr%]]
> -+ [[ ip route add default via %gateway% [[metric %metric%]] dev
> %iface% onlink ]]
> - down
> -- /bin/ip tunnel del %iface%
> -+ ip tunnel del %iface%
> -
> - method ppp
> - description
> -@@ -175,9 +175,9 @@ method ppp
> - unit number -- Use /number/ as the ppp unit number.
> - options string -- Pass /string/ as additional options to pon.
> - up
> -- /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]]
> -+ pon [[%provider%]] [[unit %unit%]] [[%options%]]
> - down
> -- /usr/bin/poff [[%provider%]]
> -+ poff [[%provider%]]
> -
> - method wvdial
> - description
> -@@ -186,10 +186,10 @@ method wvdial
> - options
> - provider name -- Use /name/ as the provider (from
> /etc/wvdial.conf).
> - up
> -- /sbin/start-stop-daemon --start -x /usr/bin/wvdial \
> -+ start-stop-daemon --start -x /usr/bin/wvdial \
> - -p /run/wvdial.%iface%.pid -b -m -- [[
> %provider% ]]
> - down
> -- /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \
> -+ start-stop-daemon --stop -x /usr/bin/wvdial \
> - -p /run/wvdial.%iface%.pid -s 2
> -
> -
> -@@ -200,9 +200,9 @@ method ipv4ll
> - known as APIPA or IPAC, and often colloquially referred to
> - as "Zeroconf address".
> - up
> -- /usr/sbin/avahi-autoipd -D %iface%
> -+ avahi-autoipd -D %iface%
> - down
> -- /usr/sbin/avahi-autoipd --kill %iface%
> -+ avahi-autoipd --kill %iface%
> -
> - architecture kfreebsd
> -
> -@@ -211,11 +211,11 @@ method loopback
> - This method may be used to define the IPv4 loopback interface.
> -
> - up
> -- /sbin/ifconfig %iface% 127.0.0.1 up \
> -+ ifconfig %iface% 127.0.0.1 up \
> - if (!iface_is_lo())
> -
> - down
> -- /sbin/ifconfig %iface% down \
> -+ ifconfig %iface% down \
> - if (!iface_is_lo())
> -
> - method static
> -@@ -238,15 +238,15 @@ method static
> - hwaddress cleanup_hwaddress
> -
> - up
> -- [[ /sbin/ifconfig %iface% link %hwaddress%]]
> -- /sbin/ifconfig %iface% %address% [[netmask %netmask%]]
> [[broadcast %broadcast%]] \
> -+ [[ ifconfig %iface% link %hwaddress%]]
> -+ ifconfig %iface% %address% [[netmask %netmask%]] [[broadcast
> %broadcast%]] \
> - [[pointopoint %pointopoint%]] [[media %media%]] [[mtu %mtu%]] \
> - up
> -- [[ /sbin/route add default %gateway% ]]
> -+ [[ route add default %gateway% ]]
> -
> - down
> -- [[ /sbin/route del default %gateway% 2>&1 1>/dev/null || true
> ]]
> -- /sbin/ifconfig %iface% down
> -+ [[ route del default %gateway% 2>&1 1>/dev/null || true ]]
> -+ ifconfig %iface% down
> -
> - method manual
> - description
> -@@ -279,30 +279,30 @@ method dhcp
> - hwaddress cleanup_hwaddress
> -
> - up
> -- [[/sbin/ifconfig %iface% link %hwaddress%]]
> -- /sbin/dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf
> /var/lib/dhcp/dhclient.%iface%.leases -I -df
> /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> -+ [[ifconfig %iface% link %hwaddress%]]
> -+ dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf
> /var/lib/dhcp/dhclient.%iface%.leases -I -df
> /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> - [[-e IF_METRIC=%metric%]] \
> - if (execable("/sbin/dhclient"))
> -- /sbin/udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-H
> %hostname%]] \
> -+ udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-H
> %hostname%]] \
> - [[-c %client%]] \
> - elsif (execable("/sbin/udhcpc"))
> -- /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]]
> \
> -+ dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
> - [[-l %leasetime%]] %iface% \
> - elsif (execable("/sbin/dhcpcd"))
> - echo 'No DHCP client software found!' >/dev/stderr; false \
> - elsif (1)
> -
> - down
> -- /sbin/dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf
> /var/lib/dhcp/dhclient.%iface%.leases -I -df
> /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> -+ dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf
> /var/lib/dhcp/dhclient.%iface%.leases -I -df
> /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> - if (execable("/sbin/dhclient"))
> - if test -f /run/udhcpc.%iface%.pid; then kill -USR2 $(/bin/cat
> /run/udhcpc.%iface%.pid); kill -TERM $(/bin/cat
> /run/udhcpc.%iface%.pid); fi \
> - elsif (execable("/sbin/udhcpc"))
> -- /sbin/dhcpcd -k %iface% \
> -+ dhcpcd -k %iface% \
> - elsif (execable("/sbin/dhcpcd"))
> - echo 'No DHCP client software found!' >/dev/stderr; false \
> - elsif (1)
> -
> -- /sbin/ifconfig %iface% down
> -+ ifconfig %iface% down
> -
> - method bootp
> - description
> -@@ -316,11 +316,11 @@ method bootp
> - whatever it really is.
> -
> - up
> -- /sbin/bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server
> %server%]] \
> -+ bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server
> %server%]] \
> - [[--hwaddr %hwaddr%]] --returniffail --serverbcast
> -
> - down
> -- /sbin/ifconfig %iface% down
> -+ ifconfig %iface% down
> -
> - method ppp
> - description
> -@@ -331,9 +331,9 @@ method ppp
> - unit number -- Use /number/ as the ppp unit number.
> - options string -- Pass /string/ as additional options to pon.
> - up
> -- /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]]
> -+ pon [[%provider%]] [[unit %unit%]] [[%options%]]
> - down
> -- /usr/bin/poff [[%provider%]]
> -+ poff [[%provider%]]
> -
> - method wvdial
> - description
> -@@ -342,10 +342,10 @@ method wvdial
> - options
> - provider name -- Use /name/ as the provider (from
> /etc/wvdial.conf).
> - up
> -- /sbin/start-stop-daemon --start -x /usr/bin/wvdial \
> -+ start-stop-daemon --start -x /usr/bin/wvdial \
> - -p /run/wvdial.%iface%.pid -b -m -- [[
> %provider% ]]
> - down
> -- /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \
> -+ start-stop-daemon --stop -x /usr/bin/wvdial \
> - -p /run/wvdial.%iface%.pid -s 2
> -
> -
> -@@ -356,9 +356,9 @@ method ipv4ll
> - known as APIPA or IPAC, and often colloquially referred to
> - as "Zeroconf address".
> - up
> -- /usr/sbin/avahi-autoipd -D %iface%
> -+ avahi-autoipd -D %iface%
> - down
> -- /usr/sbin/avahi-autoipd --kill %iface%
> -+ avahi-autoipd --kill %iface%
> - architecture hurd
> -
> - method loopback
> -@@ -432,23 +432,23 @@ method dhcp
> -
> - up
> - [[Warning: Option hwaddress: %hwaddress% not yet supported]]
> -- /sbin/dhclient -4 -v -pf /run/dhclient.%iface///.%.pid -lf
> /var/lib/dhcp/dhclient.%iface///.%.leases -I -df
> /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
> -+ dhclient -4 -v -pf /run/dhclient.%iface///.%.pid -lf
> /var/lib/dhcp/dhclient.%iface///.%.leases -I -df
> /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
> - if (execable("/sbin/dhclient"))
> -- /sbin/udhcpc -n -p /run/udhcpc.%iface///.%.pid -i %iface% [[-H
> %hostname%]] \
> -+ udhcpc -n -p /run/udhcpc.%iface///.%.pid -i %iface% [[-H
> %hostname%]] \
> - [[-c %client%]] \
> - elsif (execable("/sbin/udhcpc"))
> -- /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]]
> \
> -+ dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
> - [[-l %leasetime%]] %iface% \
> - elsif (execable("/sbin/dhcpcd"))
> - echo 'No DHCP client software found!' >/dev/stderr; false \
> - elsif (1)
> -
> - down
> -- /sbin/dhclient -4 -v -r -pf /run/dhclient.%iface///.%.pid -lf
> /var/lib/dhcp/dhclient.%iface///.%.leases -I -df
> /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
> -+ dhclient -4 -v -r -pf /run/dhclient.%iface///.%.pid -lf
> /var/lib/dhcp/dhclient.%iface///.%.leases -I -df
> /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
> - if (execable("/sbin/dhclient"))
> - if test -f /run/udhcpc.%iface///.%.pid; then kill -USR2
> $(/bin/cat /run/udhcpc.%iface///.%.pid); kill -TERM $(/bin/cat
> /run/udhcpc.%iface///.%.pid); fi \
> - elsif (execable("/sbin/udhcpc"))
> -- /sbin/dhcpcd -k %iface% \
> -+ dhcpcd -k %iface% \
> - elsif (execable("/sbin/dhcpcd"))
> - echo 'No DHCP client software found!' >/dev/stderr; false \
> - elsif (1)
> -@@ -482,9 +482,9 @@ method ppp
> - unit number -- Use /number/ as the ppp unit number.
> - options string -- Pass /string/ as additional options to pon.
> - up
> -- /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]]
> -+ pon [[%provider%]] [[unit %unit%]] [[%options%]]
> - down
> -- /usr/bin/poff [[%provider%]]
> -+ poff [[%provider%]]
> -
> - method wvdial
> - description
> -@@ -493,10 +493,10 @@ method wvdial
> - options
> - provider name -- Use /name/ as the provider (from
> /etc/wvdial.conf).
> - up
> -- /sbin/start-stop-daemon --start -x /usr/bin/wvdial \
> -+ start-stop-daemon --start -x /usr/bin/wvdial \
> - -p /run/wvdial.%iface///.%.pid -b -m -- [[
> %provider% ]]
> - down
> -- /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \
> -+ start-stop-daemon --stop -x /usr/bin/wvdial \
> - -p /run/wvdial.%iface///.%.pid -s 2
> -
> -
> -@@ -507,6 +507,6 @@ method ipv4ll
> - known as APIPA or IPAC, and often colloquially referred to
> - as "Zeroconf address".
> - up
> -- /usr/sbin/avahi-autoipd -D %iface%
> -+ avahi-autoipd -D %iface%
> - down
> -- /usr/sbin/avahi-autoipd --kill %iface%
> -+ avahi-autoipd --kill %iface%
> ---
> -2.17.1
> -
> diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.22.bb
> b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb
> similarity index 83%
> rename from meta/recipes-core/ifupdown/ifupdown_0.8.22.bb
> rename to meta/recipes-core/ifupdown/ifupdown_0.8.35.bb
> index bd0989e8855..de8e1cf66ba 100644
> --- a/meta/recipes-core/ifupdown/ifupdown_0.8.22.bb
> +++ b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb
> @@ -7,12 +7,11 @@ LICENSE = "GPLv2"
> LIC_FILES_CHKSUM =
> "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
>
> SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https
> \
> - file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-
> a.patch \
> - file://inet-6-.defn-fix-inverted-checks-for-loopback.patch \
> - file://99_network \
> - file://0001-Define-FNM_EXTMATCH-for-musl.patch \
> - "
> -SRCREV = "ab5a0f464e53e172316a5ca8b5dcdc49e8848999"
> + file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-
> set-a.patch \
> + file://99_network \
> + file://0001-Define-FNM_EXTMATCH-for-musl.patch \
> + "
> +SRCREV = "4af76318cfc57f8e4a44d357104188666213bd4b"
>
> S = "${WORKDIR}/git"
>
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PATCH 02/16] ifupdown: update 0.8.22 -> 0.8.35
2019-12-19 17:03 ` Khem Raj
@ 2019-12-19 17:12 ` Alexander Kanavin
2019-12-19 17:18 ` Khem Raj
0 siblings, 1 reply; 23+ messages in thread
From: Alexander Kanavin @ 2019-12-19 17:12 UTC (permalink / raw)
To: Khem Raj; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 21765 bytes --]
Sure, added them.
I booted a system without the patch, and the network did go up without
errors.
If the patch is still relevant, I would suggest that an effort is made to
get it upstream. It will continue to be difficult to rebase.
Alex
On Thu, 19 Dec 2019 at 18:03, Khem Raj <raj.khem@gmail.com> wrote:
> On Thu, 2019-12-19 at 14:22 +0100, Alexander Kanavin wrote:
> > Remove inet-6-.defn-fix-inverted-checks-for-loopback.patch as
> > it is difficult to rebase and not clear if still necessary.
> >
>
> perhaps Cc the patch authors and get an opinion ?
>
> > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > ---
> > ...efn-fix-inverted-checks-for-loopback.patch | 403 ----------------
> > --
> > ...{ifupdown_0.8.22.bb => ifupdown_0.8.35.bb} | 11 +-
> > 2 files changed, 5 insertions(+), 409 deletions(-)
> > delete mode 100644 meta/recipes-core/ifupdown/files/inet-6-.defn-
> > fix-inverted-checks-for-loopback.patch
> > rename meta/recipes-core/ifupdown/{ifupdown_0.8.22.bb =>
> > ifupdown_0.8.35.bb} (83%)
> >
> > diff --git a/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-
> > inverted-checks-for-loopback.patch b/meta/recipes-
> > core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-
> > loopback.patch
> > deleted file mode 100644
> > index 5b0d51d736f..00000000000
> > --- a/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-
> > checks-for-loopback.patch
> > +++ /dev/null
> > @@ -1,403 +0,0 @@
> > -From 6fce99c9e42cbacde1855473b745ca1fded3fbf7 Mon Sep 17 00:00:00
> > 2001
> > -From: "Maxin B. John" <maxin.john@intel.com>
> > -Date: Wed, 21 Dec 2016 15:32:07 +0200
> > -Subject: [PATCH 2/2] inet[6].defn: fix inverted checks for loopback
> > -
> > -Compared to the hurd link.defn for loopback, we see these
> > -are inverted, meaning that you would only be able to configure
> > -a loopback device that was _not_ named "lo" (unlikely to exist).
> > -
> > -The result was that we'd update /run/network/ifstate for "lo"
> > -but never actually do anything for up/down, as shown below:
> > -
> > -root@localhost:~# ifconfig -s
> > -Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP
> > TX-OVR Flg
> > -eth0 1500 0 7736329 0 2016 0
> > 5289422 0 0 0 BMRU
> > -lo 65536 0 18 0 0
> > 0 18 0 0 0 LRU
> > -root@localhost:~# ifdown lo
> > -root@localhost:~# echo $?
> > -0
> > -root@localhost:~# ifconfig -s
> > -Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP
> > TX-OVR Flg
> > -eth0 1500 0 7736406 0 2016
> > 0 5289455 0 0 0 BMRU
> > -lo 65536 0 18 0 0
> > 0 18 0 0 0 LRU
> > -root@localhost:~# ifconfig lo down
> > -root@localhost:~# ifconfig -s
> > -Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP
> > TX-OVR Flg
> > -eth0 1500 0 7736474 0 2016
> > 0 5289481 0 0 0 BMRU
> > -root@localhost:~#
> > -
> > -Also reverted the commit:
> > -commit 80b878497663dae08f70b4d3cffe127b57a3cfc
> > -which uses absolute paths to binaries called by ifup/ifdown.
> > -
> > -Upstream-Status: Inappropriate [OE specific]
> > -
> > -Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> > -Signed-off-by: Maxin B. John <maxin.john@intel.com>
> > -Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> > ----
> > - inet.defn | 134 +++++++++++++++++++++++++++----------------------
> > -----
> > - 1 file changed, 67 insertions(+), 67 deletions(-)
> > -
> > -diff --git a/inet.defn b/inet.defn
> > -index 182b56b..31067bc 100644
> > ---- a/inet.defn
> > -+++ b/inet.defn
> > -@@ -6,10 +6,10 @@ method loopback
> > - This method may be used to define the IPv4 loopback interface.
> > -
> > - up
> > -- /bin/ip link set dev %iface% up if (!iface_is_lo())
> > -+ ip link set dev %iface% up if (!iface_is_lo())
> > -
> > - down
> > -- /bin/ip link set dev %iface% down if (!iface_is_lo())
> > -+ ip link set dev %iface% down if (!iface_is_lo())
> > -
> > - method static
> > - description
> > -@@ -36,17 +36,17 @@ method static
> > - broadcast compute_v4_broadcast
> > -
> > - up
> > -- /bin/ip addr add %address%[[/%netmask%]] [[broadcast
> > %broadcast%]] \
> > -+ ip addr add %address%[[/%netmask%]] [[broadcast %broadcast%]] \
> > - [[peer %pointopoint%]] [[scope %scope%]] dev %iface% label
> > %iface%
> > -- /bin/ip link set dev %iface% [[mtu %mtu%]] [[address
> > %hwaddress%]] up
> > -+ ip link set dev %iface% [[mtu %mtu%]] [[address %hwaddress%]]
> > up
> > -
> > -- [[ /bin/ip route add default via %gateway% [[metric %metric%]]
> > dev %iface% onlink ]]
> > -+ [[ ip route add default via %gateway% [[metric %metric%]] dev
> > %iface% onlink ]]
> > -
> > - down
> > -- [[ /bin/ip route del default via %gateway% [[metric %metric%]]
> > dev %iface% 2>&1 1>/dev/null || true ]]
> > -- /bin/ip addr del %address%[[/%netmask%]] [[broadcast
> > %broadcast%]] \
> > -+ [[ ip route del default via %gateway% [[metric %metric%]] dev
> > %iface% 2>&1 1>/dev/null || true ]]
> > -+ ip addr del %address%[[/%netmask%]] [[broadcast %broadcast%]] \
> > - [[peer %pointopoint%]] [[scope %scope%]] dev %iface% label
> > %iface%
> > -- /bin/ip link set dev %iface% down \
> > -+ ip link set dev %iface% down \
> > - if (iface_is_link())
> > -
> > - method manual
> > -@@ -63,12 +63,12 @@ method manual
> > - hwaddress cleanup_hwaddress
> > -
> > - up
> > -- [[/bin/ip link set dev %iface% mtu %mtu%]]
> > -- [[/bin/ip link set dev %iface% address %hwaddress%]]
> > -- /bin/ip link set dev %iface% up 2>/dev/null || true
> > -+ [[ip link set dev %iface% mtu %mtu%]]
> > -+ [[ip link set dev %iface% address %hwaddress%]]
> > -+ ip link set dev %iface% up 2>/dev/null || true
> > -
> > - down
> > -- /bin/ip link set dev %iface% down 2>/dev/null || true \
> > -+ ip link set dev %iface% down 2>/dev/null || true \
> > - if (iface_is_link() && !do_all)
> > -
> > - method dhcp
> > -@@ -93,33 +93,33 @@ method dhcp
> > - hwaddress cleanup_hwaddress
> > -
> > - up
> > -- [[/bin/ip link set dev %iface% address %hwaddress%]]
> > -- /sbin/dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf
> > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > -+ [[ip link set dev %iface% address %hwaddress%]]
> > -+ dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf
> > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > - [[-e IF_METRIC=%metric%]] \
> > - if (execable("/sbin/dhclient"))
> > -- /sbin/pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \
> > -+ pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \
> > - elsif (execable("/sbin/pump"))
> > -- /sbin/udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-x
> > hostname:%hostname%]] \
> > -+ udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-x
> > hostname:%hostname%]] \
> > - elsif (execable("/sbin/udhcpc"))
> > -- /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]]
> > \
> > -+ dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
> > - [[-l %leasetime%]] [[-m %metric%]] %iface% \
> > - elsif (execable("/sbin/dhcpcd"))
> > - echo 'No DHCP client software found!' >/dev/stderr; false \
> > - elsif (1)
> > -
> > - down
> > -- /sbin/dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf
> > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > -+ dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf
> > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > - if (execable("/sbin/dhclient"))
> > -- /sbin/pump -i %iface% -r \
> > -+ pump -i %iface% -r \
> > - elsif (execable("/sbin/pump"))
> > - if test -f /run/udhcpc.%iface%.pid; then kill -USR2 $(/bin/cat
> > /run/udhcpc.%iface%.pid); kill -TERM $(/bin/cat
> > /run/udhcpc.%iface%.pid); fi \
> > - elsif (execable("/sbin/udhcpc"))
> > -- /sbin/dhcpcd -k %iface% \
> > -+ dhcpcd -k %iface% \
> > - elsif (execable("/sbin/dhcpcd"))
> > - echo 'No DHCP client software found!' >/dev/stderr; false \
> > - elsif (1)
> > -
> > -- /bin/ip link set dev %iface% down \
> > -+ ip link set dev %iface% down \
> > - if (iface_is_link())
> > -
> > - method bootp
> > -@@ -134,11 +134,11 @@ method bootp
> > - whatever it really is.
> > -
> > - up
> > -- /sbin/bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server
> > %server%]] \
> > -+ bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server
> > %server%]] \
> > - [[--hwaddr %hwaddr%]] --returniffail --serverbcast
> > -
> > - down
> > -- /bin/ip link set dev %iface% down \
> > -+ ip link set dev %iface% down \
> > - if (iface_is_link())
> > -
> > - method tunnel
> > -@@ -158,13 +158,13 @@ method tunnel
> > - ttl time -- TTL setting
> > - mtu size -- MTU size
> > - up
> > -- /bin/ip tunnel add %iface% mode %mode% remote %endpoint%
> > [[local %local%]] \
> > -+ ip tunnel add %iface% mode %mode% remote %endpoint% [[local
> > %local%]] \
> > - [[ttl %ttl%]]
> > -- /bin/ip link set %iface% up [[mtu %mtu%]]
> > -- /bin/ip addr add %address%/%netmask% dev %iface% [[peer
> > %dstaddr%]]
> > -- [[ /bin/ip route add default via %gateway% [[metric %metric%]]
> > dev %iface% onlink ]]
> > -+ ip link set %iface% up [[mtu %mtu%]]
> > -+ ip addr add %address%/%netmask% dev %iface% [[peer %dstaddr%]]
> > -+ [[ ip route add default via %gateway% [[metric %metric%]] dev
> > %iface% onlink ]]
> > - down
> > -- /bin/ip tunnel del %iface%
> > -+ ip tunnel del %iface%
> > -
> > - method ppp
> > - description
> > -@@ -175,9 +175,9 @@ method ppp
> > - unit number -- Use /number/ as the ppp unit number.
> > - options string -- Pass /string/ as additional options to pon.
> > - up
> > -- /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]]
> > -+ pon [[%provider%]] [[unit %unit%]] [[%options%]]
> > - down
> > -- /usr/bin/poff [[%provider%]]
> > -+ poff [[%provider%]]
> > -
> > - method wvdial
> > - description
> > -@@ -186,10 +186,10 @@ method wvdial
> > - options
> > - provider name -- Use /name/ as the provider (from
> > /etc/wvdial.conf).
> > - up
> > -- /sbin/start-stop-daemon --start -x /usr/bin/wvdial \
> > -+ start-stop-daemon --start -x /usr/bin/wvdial \
> > - -p /run/wvdial.%iface%.pid -b -m -- [[
> > %provider% ]]
> > - down
> > -- /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \
> > -+ start-stop-daemon --stop -x /usr/bin/wvdial \
> > - -p /run/wvdial.%iface%.pid -s 2
> > -
> > -
> > -@@ -200,9 +200,9 @@ method ipv4ll
> > - known as APIPA or IPAC, and often colloquially referred to
> > - as "Zeroconf address".
> > - up
> > -- /usr/sbin/avahi-autoipd -D %iface%
> > -+ avahi-autoipd -D %iface%
> > - down
> > -- /usr/sbin/avahi-autoipd --kill %iface%
> > -+ avahi-autoipd --kill %iface%
> > -
> > - architecture kfreebsd
> > -
> > -@@ -211,11 +211,11 @@ method loopback
> > - This method may be used to define the IPv4 loopback interface.
> > -
> > - up
> > -- /sbin/ifconfig %iface% 127.0.0.1 up \
> > -+ ifconfig %iface% 127.0.0.1 up \
> > - if (!iface_is_lo())
> > -
> > - down
> > -- /sbin/ifconfig %iface% down \
> > -+ ifconfig %iface% down \
> > - if (!iface_is_lo())
> > -
> > - method static
> > -@@ -238,15 +238,15 @@ method static
> > - hwaddress cleanup_hwaddress
> > -
> > - up
> > -- [[ /sbin/ifconfig %iface% link %hwaddress%]]
> > -- /sbin/ifconfig %iface% %address% [[netmask %netmask%]]
> > [[broadcast %broadcast%]] \
> > -+ [[ ifconfig %iface% link %hwaddress%]]
> > -+ ifconfig %iface% %address% [[netmask %netmask%]] [[broadcast
> > %broadcast%]] \
> > - [[pointopoint %pointopoint%]] [[media %media%]] [[mtu %mtu%]] \
> > - up
> > -- [[ /sbin/route add default %gateway% ]]
> > -+ [[ route add default %gateway% ]]
> > -
> > - down
> > -- [[ /sbin/route del default %gateway% 2>&1 1>/dev/null || true
> > ]]
> > -- /sbin/ifconfig %iface% down
> > -+ [[ route del default %gateway% 2>&1 1>/dev/null || true ]]
> > -+ ifconfig %iface% down
> > -
> > - method manual
> > - description
> > -@@ -279,30 +279,30 @@ method dhcp
> > - hwaddress cleanup_hwaddress
> > -
> > - up
> > -- [[/sbin/ifconfig %iface% link %hwaddress%]]
> > -- /sbin/dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf
> > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > -+ [[ifconfig %iface% link %hwaddress%]]
> > -+ dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf
> > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > - [[-e IF_METRIC=%metric%]] \
> > - if (execable("/sbin/dhclient"))
> > -- /sbin/udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-H
> > %hostname%]] \
> > -+ udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-H
> > %hostname%]] \
> > - [[-c %client%]] \
> > - elsif (execable("/sbin/udhcpc"))
> > -- /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]]
> > \
> > -+ dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
> > - [[-l %leasetime%]] %iface% \
> > - elsif (execable("/sbin/dhcpcd"))
> > - echo 'No DHCP client software found!' >/dev/stderr; false \
> > - elsif (1)
> > -
> > - down
> > -- /sbin/dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf
> > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > -+ dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf
> > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > - if (execable("/sbin/dhclient"))
> > - if test -f /run/udhcpc.%iface%.pid; then kill -USR2 $(/bin/cat
> > /run/udhcpc.%iface%.pid); kill -TERM $(/bin/cat
> > /run/udhcpc.%iface%.pid); fi \
> > - elsif (execable("/sbin/udhcpc"))
> > -- /sbin/dhcpcd -k %iface% \
> > -+ dhcpcd -k %iface% \
> > - elsif (execable("/sbin/dhcpcd"))
> > - echo 'No DHCP client software found!' >/dev/stderr; false \
> > - elsif (1)
> > -
> > -- /sbin/ifconfig %iface% down
> > -+ ifconfig %iface% down
> > -
> > - method bootp
> > - description
> > -@@ -316,11 +316,11 @@ method bootp
> > - whatever it really is.
> > -
> > - up
> > -- /sbin/bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server
> > %server%]] \
> > -+ bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server
> > %server%]] \
> > - [[--hwaddr %hwaddr%]] --returniffail --serverbcast
> > -
> > - down
> > -- /sbin/ifconfig %iface% down
> > -+ ifconfig %iface% down
> > -
> > - method ppp
> > - description
> > -@@ -331,9 +331,9 @@ method ppp
> > - unit number -- Use /number/ as the ppp unit number.
> > - options string -- Pass /string/ as additional options to pon.
> > - up
> > -- /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]]
> > -+ pon [[%provider%]] [[unit %unit%]] [[%options%]]
> > - down
> > -- /usr/bin/poff [[%provider%]]
> > -+ poff [[%provider%]]
> > -
> > - method wvdial
> > - description
> > -@@ -342,10 +342,10 @@ method wvdial
> > - options
> > - provider name -- Use /name/ as the provider (from
> > /etc/wvdial.conf).
> > - up
> > -- /sbin/start-stop-daemon --start -x /usr/bin/wvdial \
> > -+ start-stop-daemon --start -x /usr/bin/wvdial \
> > - -p /run/wvdial.%iface%.pid -b -m -- [[
> > %provider% ]]
> > - down
> > -- /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \
> > -+ start-stop-daemon --stop -x /usr/bin/wvdial \
> > - -p /run/wvdial.%iface%.pid -s 2
> > -
> > -
> > -@@ -356,9 +356,9 @@ method ipv4ll
> > - known as APIPA or IPAC, and often colloquially referred to
> > - as "Zeroconf address".
> > - up
> > -- /usr/sbin/avahi-autoipd -D %iface%
> > -+ avahi-autoipd -D %iface%
> > - down
> > -- /usr/sbin/avahi-autoipd --kill %iface%
> > -+ avahi-autoipd --kill %iface%
> > - architecture hurd
> > -
> > - method loopback
> > -@@ -432,23 +432,23 @@ method dhcp
> > -
> > - up
> > - [[Warning: Option hwaddress: %hwaddress% not yet supported]]
> > -- /sbin/dhclient -4 -v -pf /run/dhclient.%iface///.%.pid -lf
> > /var/lib/dhcp/dhclient.%iface///.%.leases -I -df
> > /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
> > -+ dhclient -4 -v -pf /run/dhclient.%iface///.%.pid -lf
> > /var/lib/dhcp/dhclient.%iface///.%.leases -I -df
> > /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
> > - if (execable("/sbin/dhclient"))
> > -- /sbin/udhcpc -n -p /run/udhcpc.%iface///.%.pid -i %iface% [[-H
> > %hostname%]] \
> > -+ udhcpc -n -p /run/udhcpc.%iface///.%.pid -i %iface% [[-H
> > %hostname%]] \
> > - [[-c %client%]] \
> > - elsif (execable("/sbin/udhcpc"))
> > -- /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]]
> > \
> > -+ dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
> > - [[-l %leasetime%]] %iface% \
> > - elsif (execable("/sbin/dhcpcd"))
> > - echo 'No DHCP client software found!' >/dev/stderr; false \
> > - elsif (1)
> > -
> > - down
> > -- /sbin/dhclient -4 -v -r -pf /run/dhclient.%iface///.%.pid -lf
> > /var/lib/dhcp/dhclient.%iface///.%.leases -I -df
> > /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
> > -+ dhclient -4 -v -r -pf /run/dhclient.%iface///.%.pid -lf
> > /var/lib/dhcp/dhclient.%iface///.%.leases -I -df
> > /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
> > - if (execable("/sbin/dhclient"))
> > - if test -f /run/udhcpc.%iface///.%.pid; then kill -USR2
> > $(/bin/cat /run/udhcpc.%iface///.%.pid); kill -TERM $(/bin/cat
> > /run/udhcpc.%iface///.%.pid); fi \
> > - elsif (execable("/sbin/udhcpc"))
> > -- /sbin/dhcpcd -k %iface% \
> > -+ dhcpcd -k %iface% \
> > - elsif (execable("/sbin/dhcpcd"))
> > - echo 'No DHCP client software found!' >/dev/stderr; false \
> > - elsif (1)
> > -@@ -482,9 +482,9 @@ method ppp
> > - unit number -- Use /number/ as the ppp unit number.
> > - options string -- Pass /string/ as additional options to pon.
> > - up
> > -- /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]]
> > -+ pon [[%provider%]] [[unit %unit%]] [[%options%]]
> > - down
> > -- /usr/bin/poff [[%provider%]]
> > -+ poff [[%provider%]]
> > -
> > - method wvdial
> > - description
> > -@@ -493,10 +493,10 @@ method wvdial
> > - options
> > - provider name -- Use /name/ as the provider (from
> > /etc/wvdial.conf).
> > - up
> > -- /sbin/start-stop-daemon --start -x /usr/bin/wvdial \
> > -+ start-stop-daemon --start -x /usr/bin/wvdial \
> > - -p /run/wvdial.%iface///.%.pid -b -m -- [[
> > %provider% ]]
> > - down
> > -- /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \
> > -+ start-stop-daemon --stop -x /usr/bin/wvdial \
> > - -p /run/wvdial.%iface///.%.pid -s 2
> > -
> > -
> > -@@ -507,6 +507,6 @@ method ipv4ll
> > - known as APIPA or IPAC, and often colloquially referred to
> > - as "Zeroconf address".
> > - up
> > -- /usr/sbin/avahi-autoipd -D %iface%
> > -+ avahi-autoipd -D %iface%
> > - down
> > -- /usr/sbin/avahi-autoipd --kill %iface%
> > -+ avahi-autoipd --kill %iface%
> > ---
> > -2.17.1
> > -
> > diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.22.bb
> > b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb
> > similarity index 83%
> > rename from meta/recipes-core/ifupdown/ifupdown_0.8.22.bb
> > rename to meta/recipes-core/ifupdown/ifupdown_0.8.35.bb
> > index bd0989e8855..de8e1cf66ba 100644
> > --- a/meta/recipes-core/ifupdown/ifupdown_0.8.22.bb
> > +++ b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb
> > @@ -7,12 +7,11 @@ LICENSE = "GPLv2"
> > LIC_FILES_CHKSUM =
> > "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
> >
> > SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https
> > \
> > - file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-
> > a.patch \
> > - file://inet-6-.defn-fix-inverted-checks-for-loopback.patch \
> > - file://99_network \
> > - file://0001-Define-FNM_EXTMATCH-for-musl.patch \
> > - "
> > -SRCREV = "ab5a0f464e53e172316a5ca8b5dcdc49e8848999"
> > + file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-
> > set-a.patch \
> > + file://99_network \
> > + file://0001-Define-FNM_EXTMATCH-for-musl.patch \
> > + "
> > +SRCREV = "4af76318cfc57f8e4a44d357104188666213bd4b"
> >
> > S = "${WORKDIR}/git"
> >
> > --
> > 2.17.1
> >
>
>
[-- Attachment #2: Type: text/html, Size: 27515 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PATCH 02/16] ifupdown: update 0.8.22 -> 0.8.35
2019-12-19 17:12 ` Alexander Kanavin
@ 2019-12-19 17:18 ` Khem Raj
2019-12-19 17:22 ` Alexander Kanavin
2019-12-20 15:32 ` Paul Gortmaker
0 siblings, 2 replies; 23+ messages in thread
From: Khem Raj @ 2019-12-19 17:18 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: OE-core
On Thu, 2019-12-19 at 18:12 +0100, Alexander Kanavin wrote:
> Sure, added them.
>
> I booted a system without the patch, and the network did go up
> without errors.
>
> If the patch is still relevant, I would suggest that an effort is
> made to get it upstream. It will continue to be difficult to rebase.
>
I dont disagree. Until then I also worry that we might regress on what
we have provided to end user. So it will help in getting more info
either way.
> Alex
>
> On Thu, 19 Dec 2019 at 18:03, Khem Raj <raj.khem@gmail.com> wrote:
> > On Thu, 2019-12-19 at 14:22 +0100, Alexander Kanavin wrote:
> > > Remove inet-6-.defn-fix-inverted-checks-for-loopback.patch as
> > > it is difficult to rebase and not clear if still necessary.
> > >
> >
> > perhaps Cc the patch authors and get an opinion ?
> >
> > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > > ---
> > > ...efn-fix-inverted-checks-for-loopback.patch | 403 ------------
> > ----
> > > --
> > > ...{ifupdown_0.8.22.bb => ifupdown_0.8.35.bb} | 11 +-
> > > 2 files changed, 5 insertions(+), 409 deletions(-)
> > > delete mode 100644 meta/recipes-core/ifupdown/files/inet-6-
> > .defn-
> > > fix-inverted-checks-for-loopback.patch
> > > rename meta/recipes-core/ifupdown/{ifupdown_0.8.22.bb =>
> > > ifupdown_0.8.35.bb} (83%)
> > >
> > > diff --git a/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-
> > > inverted-checks-for-loopback.patch b/meta/recipes-
> > > core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-
> > > loopback.patch
> > > deleted file mode 100644
> > > index 5b0d51d736f..00000000000
> > > --- a/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-
> > > checks-for-loopback.patch
> > > +++ /dev/null
> > > @@ -1,403 +0,0 @@
> > > -From 6fce99c9e42cbacde1855473b745ca1fded3fbf7 Mon Sep 17
> > 00:00:00
> > > 2001
> > > -From: "Maxin B. John" <maxin.john@intel.com>
> > > -Date: Wed, 21 Dec 2016 15:32:07 +0200
> > > -Subject: [PATCH 2/2] inet[6].defn: fix inverted checks for
> > loopback
> > > -
> > > -Compared to the hurd link.defn for loopback, we see these
> > > -are inverted, meaning that you would only be able to configure
> > > -a loopback device that was _not_ named "lo" (unlikely to exist).
> > > -
> > > -The result was that we'd update /run/network/ifstate for "lo"
> > > -but never actually do anything for up/down, as shown below:
> > > -
> > > -root@localhost:~# ifconfig -s
> > > -Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-
> > DRP
> > > TX-OVR Flg
> > > -eth0 1500 0 7736329 0 2016 0
> > > 5289422 0 0 0 BMRU
> > > -lo 65536 0 18 0 0
> > > 0 18 0 0 0 LRU
> > > -root@localhost:~# ifdown lo
> > > -root@localhost:~# echo $?
> > > -0
> > > -root@localhost:~# ifconfig -s
> > > -Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR
> > TX-DRP
> > > TX-OVR Flg
> > > -eth0 1500 0 7736406 0 2016
> > > 0 5289455 0 0 0 BMRU
> > > -lo 65536 0 18 0 0
> > > 0 18 0 0 0 LRU
> > > -root@localhost:~# ifconfig lo down
> > > -root@localhost:~# ifconfig -s
> > > -Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-
> > DRP
> > > TX-OVR Flg
> > > -eth0 1500 0 7736474 0 2016
> > > 0 5289481 0 0 0 BMRU
> > > -root@localhost:~#
> > > -
> > > -Also reverted the commit:
> > > -commit 80b878497663dae08f70b4d3cffe127b57a3cfc
> > > -which uses absolute paths to binaries called by ifup/ifdown.
> > > -
> > > -Upstream-Status: Inappropriate [OE specific]
> > > -
> > > -Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> > > -Signed-off-by: Maxin B. John <maxin.john@intel.com>
> > > -Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> > > ----
> > > - inet.defn | 134 +++++++++++++++++++++++++++------------------
> > ----
> > > -----
> > > - 1 file changed, 67 insertions(+), 67 deletions(-)
> > > -
> > > -diff --git a/inet.defn b/inet.defn
> > > -index 182b56b..31067bc 100644
> > > ---- a/inet.defn
> > > -+++ b/inet.defn
> > > -@@ -6,10 +6,10 @@ method loopback
> > > - This method may be used to define the IPv4 loopback
> > interface.
> > > -
> > > - up
> > > -- /bin/ip link set dev %iface% up if (!iface_is_lo())
> > > -+ ip link set dev %iface% up if (!iface_is_lo())
> > > -
> > > - down
> > > -- /bin/ip link set dev %iface% down if (!iface_is_lo())
> > > -+ ip link set dev %iface% down if (!iface_is_lo())
> > > -
> > > - method static
> > > - description
> > > -@@ -36,17 +36,17 @@ method static
> > > - broadcast compute_v4_broadcast
> > > -
> > > - up
> > > -- /bin/ip addr add %address%[[/%netmask%]] [[broadcast
> > > %broadcast%]] \
> > > -+ ip addr add %address%[[/%netmask%]] [[broadcast
> > %broadcast%]] \
> > > - [[peer %pointopoint%]] [[scope %scope%]] dev %iface% label
> > > %iface%
> > > -- /bin/ip link set dev %iface% [[mtu %mtu%]] [[address
> > > %hwaddress%]] up
> > > -+ ip link set dev %iface% [[mtu %mtu%]] [[address
> > %hwaddress%]]
> > > up
> > > -
> > > -- [[ /bin/ip route add default via %gateway% [[metric
> > %metric%]]
> > > dev %iface% onlink ]]
> > > -+ [[ ip route add default via %gateway% [[metric %metric%]]
> > dev
> > > %iface% onlink ]]
> > > -
> > > - down
> > > -- [[ /bin/ip route del default via %gateway% [[metric
> > %metric%]]
> > > dev %iface% 2>&1 1>/dev/null || true ]]
> > > -- /bin/ip addr del %address%[[/%netmask%]] [[broadcast
> > > %broadcast%]] \
> > > -+ [[ ip route del default via %gateway% [[metric %metric%]]
> > dev
> > > %iface% 2>&1 1>/dev/null || true ]]
> > > -+ ip addr del %address%[[/%netmask%]] [[broadcast
> > %broadcast%]] \
> > > - [[peer %pointopoint%]] [[scope %scope%]] dev %iface% label
> > > %iface%
> > > -- /bin/ip link set dev %iface% down \
> > > -+ ip link set dev %iface% down \
> > > - if (iface_is_link())
> > > -
> > > - method manual
> > > -@@ -63,12 +63,12 @@ method manual
> > > - hwaddress cleanup_hwaddress
> > > -
> > > - up
> > > -- [[/bin/ip link set dev %iface% mtu %mtu%]]
> > > -- [[/bin/ip link set dev %iface% address %hwaddress%]]
> > > -- /bin/ip link set dev %iface% up 2>/dev/null || true
> > > -+ [[ip link set dev %iface% mtu %mtu%]]
> > > -+ [[ip link set dev %iface% address %hwaddress%]]
> > > -+ ip link set dev %iface% up 2>/dev/null || true
> > > -
> > > - down
> > > -- /bin/ip link set dev %iface% down 2>/dev/null || true \
> > > -+ ip link set dev %iface% down 2>/dev/null || true \
> > > - if (iface_is_link() && !do_all)
> > > -
> > > - method dhcp
> > > -@@ -93,33 +93,33 @@ method dhcp
> > > - hwaddress cleanup_hwaddress
> > > -
> > > - up
> > > -- [[/bin/ip link set dev %iface% address %hwaddress%]]
> > > -- /sbin/dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf
> > > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > > -+ [[ip link set dev %iface% address %hwaddress%]]
> > > -+ dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf
> > > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > > - [[-e IF_METRIC=%metric%]] \
> > > - if (execable("/sbin/dhclient"))
> > > -- /sbin/pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]]
> > \
> > > -+ pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \
> > > - elsif (execable("/sbin/pump"))
> > > -- /sbin/udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-x
> > > hostname:%hostname%]] \
> > > -+ udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-x
> > > hostname:%hostname%]] \
> > > - elsif (execable("/sbin/udhcpc"))
> > > -- /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I
> > %client%]]
> > > \
> > > -+ dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
> > > - [[-l %leasetime%]] [[-m %metric%]] %iface% \
> > > - elsif (execable("/sbin/dhcpcd"))
> > > - echo 'No DHCP client software found!' >/dev/stderr; false \
> > > - elsif (1)
> > > -
> > > - down
> > > -- /sbin/dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf
> > > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > > -+ dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf
> > > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > > - if (execable("/sbin/dhclient"))
> > > -- /sbin/pump -i %iface% -r \
> > > -+ pump -i %iface% -r \
> > > - elsif (execable("/sbin/pump"))
> > > - if test -f /run/udhcpc.%iface%.pid; then kill -USR2
> > $(/bin/cat
> > > /run/udhcpc.%iface%.pid); kill -TERM $(/bin/cat
> > > /run/udhcpc.%iface%.pid); fi \
> > > - elsif (execable("/sbin/udhcpc"))
> > > -- /sbin/dhcpcd -k %iface% \
> > > -+ dhcpcd -k %iface% \
> > > - elsif (execable("/sbin/dhcpcd"))
> > > - echo 'No DHCP client software found!' >/dev/stderr; false \
> > > - elsif (1)
> > > -
> > > -- /bin/ip link set dev %iface% down \
> > > -+ ip link set dev %iface% down \
> > > - if (iface_is_link())
> > > -
> > > - method bootp
> > > -@@ -134,11 +134,11 @@ method bootp
> > > - whatever it really is.
> > > -
> > > - up
> > > -- /sbin/bootpc [[--bootfile %bootfile%]] --dev %iface% [[
> > --server
> > > %server%]] \
> > > -+ bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server
> > > %server%]] \
> > > - [[--hwaddr %hwaddr%]] --returniffail --serverbcast
> > > -
> > > - down
> > > -- /bin/ip link set dev %iface% down \
> > > -+ ip link set dev %iface% down \
> > > - if (iface_is_link())
> > > -
> > > - method tunnel
> > > -@@ -158,13 +158,13 @@ method tunnel
> > > - ttl time -- TTL setting
> > > - mtu size -- MTU size
> > > - up
> > > -- /bin/ip tunnel add %iface% mode %mode% remote %endpoint%
> > > [[local %local%]] \
> > > -+ ip tunnel add %iface% mode %mode% remote %endpoint% [[local
> > > %local%]] \
> > > - [[ttl %ttl%]]
> > > -- /bin/ip link set %iface% up [[mtu %mtu%]]
> > > -- /bin/ip addr add %address%/%netmask% dev %iface% [[peer
> > > %dstaddr%]]
> > > -- [[ /bin/ip route add default via %gateway% [[metric
> > %metric%]]
> > > dev %iface% onlink ]]
> > > -+ ip link set %iface% up [[mtu %mtu%]]
> > > -+ ip addr add %address%/%netmask% dev %iface% [[peer
> > %dstaddr%]]
> > > -+ [[ ip route add default via %gateway% [[metric %metric%]]
> > dev
> > > %iface% onlink ]]
> > > - down
> > > -- /bin/ip tunnel del %iface%
> > > -+ ip tunnel del %iface%
> > > -
> > > - method ppp
> > > - description
> > > -@@ -175,9 +175,9 @@ method ppp
> > > - unit number -- Use /number/ as the ppp unit number.
> > > - options string -- Pass /string/ as additional options to
> > pon.
> > > - up
> > > -- /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]]
> > > -+ pon [[%provider%]] [[unit %unit%]] [[%options%]]
> > > - down
> > > -- /usr/bin/poff [[%provider%]]
> > > -+ poff [[%provider%]]
> > > -
> > > - method wvdial
> > > - description
> > > -@@ -186,10 +186,10 @@ method wvdial
> > > - options
> > > - provider name -- Use /name/ as the provider (from
> > > /etc/wvdial.conf).
> > > - up
> > > -- /sbin/start-stop-daemon --start -x /usr/bin/wvdial \
> > > -+ start-stop-daemon --start -x /usr/bin/wvdial \
> > > - -p /run/wvdial.%iface%.pid -b -m -- [[
> > > %provider% ]]
> > > - down
> > > -- /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \
> > > -+ start-stop-daemon --stop -x /usr/bin/wvdial \
> > > - -p /run/wvdial.%iface%.pid -s 2
> > > -
> > > -
> > > -@@ -200,9 +200,9 @@ method ipv4ll
> > > - known as APIPA or IPAC, and often colloquially referred to
> > > - as "Zeroconf address".
> > > - up
> > > -- /usr/sbin/avahi-autoipd -D %iface%
> > > -+ avahi-autoipd -D %iface%
> > > - down
> > > -- /usr/sbin/avahi-autoipd --kill %iface%
> > > -+ avahi-autoipd --kill %iface%
> > > -
> > > - architecture kfreebsd
> > > -
> > > -@@ -211,11 +211,11 @@ method loopback
> > > - This method may be used to define the IPv4 loopback
> > interface.
> > > -
> > > - up
> > > -- /sbin/ifconfig %iface% 127.0.0.1 up \
> > > -+ ifconfig %iface% 127.0.0.1 up \
> > > - if (!iface_is_lo())
> > > -
> > > - down
> > > -- /sbin/ifconfig %iface% down \
> > > -+ ifconfig %iface% down \
> > > - if (!iface_is_lo())
> > > -
> > > - method static
> > > -@@ -238,15 +238,15 @@ method static
> > > - hwaddress cleanup_hwaddress
> > > -
> > > - up
> > > -- [[ /sbin/ifconfig %iface% link %hwaddress%]]
> > > -- /sbin/ifconfig %iface% %address% [[netmask %netmask%]]
> > > [[broadcast %broadcast%]] \
> > > -+ [[ ifconfig %iface% link %hwaddress%]]
> > > -+ ifconfig %iface% %address% [[netmask %netmask%]]
> > [[broadcast
> > > %broadcast%]] \
> > > - [[pointopoint %pointopoint%]] [[media %media%]] [[mtu
> > %mtu%]] \
> > > - up
> > > -- [[ /sbin/route add default %gateway% ]]
> > > -+ [[ route add default %gateway% ]]
> > > -
> > > - down
> > > -- [[ /sbin/route del default %gateway% 2>&1 1>/dev/null ||
> > true
> > > ]]
> > > -- /sbin/ifconfig %iface% down
> > > -+ [[ route del default %gateway% 2>&1 1>/dev/null || true ]]
> > > -+ ifconfig %iface% down
> > > -
> > > - method manual
> > > - description
> > > -@@ -279,30 +279,30 @@ method dhcp
> > > - hwaddress cleanup_hwaddress
> > > -
> > > - up
> > > -- [[/sbin/ifconfig %iface% link %hwaddress%]]
> > > -- /sbin/dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf
> > > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > > -+ [[ifconfig %iface% link %hwaddress%]]
> > > -+ dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf
> > > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > > - [[-e IF_METRIC=%metric%]] \
> > > - if (execable("/sbin/dhclient"))
> > > -- /sbin/udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-H
> > > %hostname%]] \
> > > -+ udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-H
> > > %hostname%]] \
> > > - [[-c %client%]] \
> > > - elsif (execable("/sbin/udhcpc"))
> > > -- /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I
> > %client%]]
> > > \
> > > -+ dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
> > > - [[-l %leasetime%]] %iface% \
> > > - elsif (execable("/sbin/dhcpcd"))
> > > - echo 'No DHCP client software found!' >/dev/stderr; false \
> > > - elsif (1)
> > > -
> > > - down
> > > -- /sbin/dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf
> > > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > > -+ dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf
> > > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > > - if (execable("/sbin/dhclient"))
> > > - if test -f /run/udhcpc.%iface%.pid; then kill -USR2
> > $(/bin/cat
> > > /run/udhcpc.%iface%.pid); kill -TERM $(/bin/cat
> > > /run/udhcpc.%iface%.pid); fi \
> > > - elsif (execable("/sbin/udhcpc"))
> > > -- /sbin/dhcpcd -k %iface% \
> > > -+ dhcpcd -k %iface% \
> > > - elsif (execable("/sbin/dhcpcd"))
> > > - echo 'No DHCP client software found!' >/dev/stderr; false \
> > > - elsif (1)
> > > -
> > > -- /sbin/ifconfig %iface% down
> > > -+ ifconfig %iface% down
> > > -
> > > - method bootp
> > > - description
> > > -@@ -316,11 +316,11 @@ method bootp
> > > - whatever it really is.
> > > -
> > > - up
> > > -- /sbin/bootpc [[--bootfile %bootfile%]] --dev %iface% [[
> > --server
> > > %server%]] \
> > > -+ bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server
> > > %server%]] \
> > > - [[--hwaddr %hwaddr%]] --returniffail --serverbcast
> > > -
> > > - down
> > > -- /sbin/ifconfig %iface% down
> > > -+ ifconfig %iface% down
> > > -
> > > - method ppp
> > > - description
> > > -@@ -331,9 +331,9 @@ method ppp
> > > - unit number -- Use /number/ as the ppp unit number.
> > > - options string -- Pass /string/ as additional options to
> > pon.
> > > - up
> > > -- /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]]
> > > -+ pon [[%provider%]] [[unit %unit%]] [[%options%]]
> > > - down
> > > -- /usr/bin/poff [[%provider%]]
> > > -+ poff [[%provider%]]
> > > -
> > > - method wvdial
> > > - description
> > > -@@ -342,10 +342,10 @@ method wvdial
> > > - options
> > > - provider name -- Use /name/ as the provider (from
> > > /etc/wvdial.conf).
> > > - up
> > > -- /sbin/start-stop-daemon --start -x /usr/bin/wvdial \
> > > -+ start-stop-daemon --start -x /usr/bin/wvdial \
> > > - -p /run/wvdial.%iface%.pid -b -m -- [[
> > > %provider% ]]
> > > - down
> > > -- /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \
> > > -+ start-stop-daemon --stop -x /usr/bin/wvdial \
> > > - -p /run/wvdial.%iface%.pid -s 2
> > > -
> > > -
> > > -@@ -356,9 +356,9 @@ method ipv4ll
> > > - known as APIPA or IPAC, and often colloquially referred to
> > > - as "Zeroconf address".
> > > - up
> > > -- /usr/sbin/avahi-autoipd -D %iface%
> > > -+ avahi-autoipd -D %iface%
> > > - down
> > > -- /usr/sbin/avahi-autoipd --kill %iface%
> > > -+ avahi-autoipd --kill %iface%
> > > - architecture hurd
> > > -
> > > - method loopback
> > > -@@ -432,23 +432,23 @@ method dhcp
> > > -
> > > - up
> > > - [[Warning: Option hwaddress: %hwaddress% not yet
> > supported]]
> > > -- /sbin/dhclient -4 -v -pf /run/dhclient.%iface///.%.pid -lf
> > > /var/lib/dhcp/dhclient.%iface///.%.leases -I -df
> > > /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
> > > -+ dhclient -4 -v -pf /run/dhclient.%iface///.%.pid -lf
> > > /var/lib/dhcp/dhclient.%iface///.%.leases -I -df
> > > /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
> > > - if (execable("/sbin/dhclient"))
> > > -- /sbin/udhcpc -n -p /run/udhcpc.%iface///.%.pid -i %iface%
> > [[-H
> > > %hostname%]] \
> > > -+ udhcpc -n -p /run/udhcpc.%iface///.%.pid -i %iface% [[-H
> > > %hostname%]] \
> > > - [[-c %client%]] \
> > > - elsif (execable("/sbin/udhcpc"))
> > > -- /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I
> > %client%]]
> > > \
> > > -+ dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
> > > - [[-l %leasetime%]] %iface% \
> > > - elsif (execable("/sbin/dhcpcd"))
> > > - echo 'No DHCP client software found!' >/dev/stderr; false \
> > > - elsif (1)
> > > -
> > > - down
> > > -- /sbin/dhclient -4 -v -r -pf /run/dhclient.%iface///.%.pid
> > -lf
> > > /var/lib/dhcp/dhclient.%iface///.%.leases -I -df
> > > /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
> > > -+ dhclient -4 -v -r -pf /run/dhclient.%iface///.%.pid -lf
> > > /var/lib/dhcp/dhclient.%iface///.%.leases -I -df
> > > /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
> > > - if (execable("/sbin/dhclient"))
> > > - if test -f /run/udhcpc.%iface///.%.pid; then kill -USR2
> > > $(/bin/cat /run/udhcpc.%iface///.%.pid); kill -TERM $(/bin/cat
> > > /run/udhcpc.%iface///.%.pid); fi \
> > > - elsif (execable("/sbin/udhcpc"))
> > > -- /sbin/dhcpcd -k %iface% \
> > > -+ dhcpcd -k %iface% \
> > > - elsif (execable("/sbin/dhcpcd"))
> > > - echo 'No DHCP client software found!' >/dev/stderr; false \
> > > - elsif (1)
> > > -@@ -482,9 +482,9 @@ method ppp
> > > - unit number -- Use /number/ as the ppp unit number.
> > > - options string -- Pass /string/ as additional options to
> > pon.
> > > - up
> > > -- /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]]
> > > -+ pon [[%provider%]] [[unit %unit%]] [[%options%]]
> > > - down
> > > -- /usr/bin/poff [[%provider%]]
> > > -+ poff [[%provider%]]
> > > -
> > > - method wvdial
> > > - description
> > > -@@ -493,10 +493,10 @@ method wvdial
> > > - options
> > > - provider name -- Use /name/ as the provider (from
> > > /etc/wvdial.conf).
> > > - up
> > > -- /sbin/start-stop-daemon --start -x /usr/bin/wvdial \
> > > -+ start-stop-daemon --start -x /usr/bin/wvdial \
> > > - -p /run/wvdial.%iface///.%.pid -b -m --
> > [[
> > > %provider% ]]
> > > - down
> > > -- /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \
> > > -+ start-stop-daemon --stop -x /usr/bin/wvdial \
> > > - -p /run/wvdial.%iface///.%.pid -s 2
> > > -
> > > -
> > > -@@ -507,6 +507,6 @@ method ipv4ll
> > > - known as APIPA or IPAC, and often colloquially referred to
> > > - as "Zeroconf address".
> > > - up
> > > -- /usr/sbin/avahi-autoipd -D %iface%
> > > -+ avahi-autoipd -D %iface%
> > > - down
> > > -- /usr/sbin/avahi-autoipd --kill %iface%
> > > -+ avahi-autoipd --kill %iface%
> > > ---
> > > -2.17.1
> > > -
> > > diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.22.bb
> > > b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb
> > > similarity index 83%
> > > rename from meta/recipes-core/ifupdown/ifupdown_0.8.22.bb
> > > rename to meta/recipes-core/ifupdown/ifupdown_0.8.35.bb
> > > index bd0989e8855..de8e1cf66ba 100644
> > > --- a/meta/recipes-core/ifupdown/ifupdown_0.8.22.bb
> > > +++ b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb
> > > @@ -7,12 +7,11 @@ LICENSE = "GPLv2"
> > > LIC_FILES_CHKSUM =
> > > "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
> > >
> > > SRC_URI =
> > "git://salsa.debian.org/debian/ifupdown.git;protocol=https
> > > \
> > > - file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-
> > set-
> > > a.patch \
> > > - file://inet-6-.defn-fix-inverted-checks-for-
> > loopback.patch \
> > > - file://99_network \
> > > - file://0001-Define-FNM_EXTMATCH-for-musl.patch \
> > > - "
> > > -SRCREV = "ab5a0f464e53e172316a5ca8b5dcdc49e8848999"
> > > + file://defn2-c-man-don-t-rely-on-dpkg-architecture-
> > to-
> > > set-a.patch \
> > > + file://99_network \
> > > + file://0001-Define-FNM_EXTMATCH-for-musl.patch \
> > > + "
> > > +SRCREV = "4af76318cfc57f8e4a44d357104188666213bd4b"
> > >
> > > S = "${WORKDIR}/git"
> > >
> > > --
> > > 2.17.1
> > >
> >
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PATCH 02/16] ifupdown: update 0.8.22 -> 0.8.35
2019-12-19 17:18 ` Khem Raj
@ 2019-12-19 17:22 ` Alexander Kanavin
2019-12-20 15:32 ` Paul Gortmaker
1 sibling, 0 replies; 23+ messages in thread
From: Alexander Kanavin @ 2019-12-19 17:22 UTC (permalink / raw)
To: Khem Raj; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 24779 bytes --]
On Thu, 19 Dec 2019 at 18:18, Khem Raj <raj.khem@gmail.com> wrote:
> On Thu, 2019-12-19 at 18:12 +0100, Alexander Kanavin wrote:
> > Sure, added them.
> >
> > I booted a system without the patch, and the network did go up
> > without errors.
> >
> > If the patch is still relevant, I would suggest that an effort is
> > made to get it upstream. It will continue to be difficult to rebase.
> >
>
> I dont disagree. Until then I also worry that we might regress on what
> we have provided to end user. So it will help in getting more info
> either way.
>
Sure, although I also tend to think that if something is not covered by the
AB testing, then there are no promises about that something. If AB doesn't
fail, then it's fine to remove.
Alex
>
> > Alex
> >
> > On Thu, 19 Dec 2019 at 18:03, Khem Raj <raj.khem@gmail.com> wrote:
> > > On Thu, 2019-12-19 at 14:22 +0100, Alexander Kanavin wrote:
> > > > Remove inet-6-.defn-fix-inverted-checks-for-loopback.patch as
> > > > it is difficult to rebase and not clear if still necessary.
> > > >
> > >
> > > perhaps Cc the patch authors and get an opinion ?
> > >
> > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > > > ---
> > > > ...efn-fix-inverted-checks-for-loopback.patch | 403 ------------
> > > ----
> > > > --
> > > > ...{ifupdown_0.8.22.bb => ifupdown_0.8.35.bb} | 11 +-
> > > > 2 files changed, 5 insertions(+), 409 deletions(-)
> > > > delete mode 100644 meta/recipes-core/ifupdown/files/inet-6-
> > > .defn-
> > > > fix-inverted-checks-for-loopback.patch
> > > > rename meta/recipes-core/ifupdown/{ifupdown_0.8.22.bb =>
> > > > ifupdown_0.8.35.bb} (83%)
> > > >
> > > > diff --git a/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-
> > > > inverted-checks-for-loopback.patch b/meta/recipes-
> > > > core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-
> > > > loopback.patch
> > > > deleted file mode 100644
> > > > index 5b0d51d736f..00000000000
> > > > --- a/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-
> > > > checks-for-loopback.patch
> > > > +++ /dev/null
> > > > @@ -1,403 +0,0 @@
> > > > -From 6fce99c9e42cbacde1855473b745ca1fded3fbf7 Mon Sep 17
> > > 00:00:00
> > > > 2001
> > > > -From: "Maxin B. John" <maxin.john@intel.com>
> > > > -Date: Wed, 21 Dec 2016 15:32:07 +0200
> > > > -Subject: [PATCH 2/2] inet[6].defn: fix inverted checks for
> > > loopback
> > > > -
> > > > -Compared to the hurd link.defn for loopback, we see these
> > > > -are inverted, meaning that you would only be able to configure
> > > > -a loopback device that was _not_ named "lo" (unlikely to exist).
> > > > -
> > > > -The result was that we'd update /run/network/ifstate for "lo"
> > > > -but never actually do anything for up/down, as shown below:
> > > > -
> > > > -root@localhost:~# ifconfig -s
> > > > -Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-
> > > DRP
> > > > TX-OVR Flg
> > > > -eth0 1500 0 7736329 0 2016 0
> > > > 5289422 0 0 0 BMRU
> > > > -lo 65536 0 18 0 0
> > > > 0 18 0 0 0 LRU
> > > > -root@localhost:~# ifdown lo
> > > > -root@localhost:~# echo $?
> > > > -0
> > > > -root@localhost:~# ifconfig -s
> > > > -Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR
> > > TX-DRP
> > > > TX-OVR Flg
> > > > -eth0 1500 0 7736406 0 2016
> > > > 0 5289455 0 0 0 BMRU
> > > > -lo 65536 0 18 0 0
> > > > 0 18 0 0 0 LRU
> > > > -root@localhost:~# ifconfig lo down
> > > > -root@localhost:~# ifconfig -s
> > > > -Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-
> > > DRP
> > > > TX-OVR Flg
> > > > -eth0 1500 0 7736474 0 2016
> > > > 0 5289481 0 0 0 BMRU
> > > > -root@localhost:~#
> > > > -
> > > > -Also reverted the commit:
> > > > -commit 80b878497663dae08f70b4d3cffe127b57a3cfc
> > > > -which uses absolute paths to binaries called by ifup/ifdown.
> > > > -
> > > > -Upstream-Status: Inappropriate [OE specific]
> > > > -
> > > > -Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> > > > -Signed-off-by: Maxin B. John <maxin.john@intel.com>
> > > > -Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> > > > ----
> > > > - inet.defn | 134 +++++++++++++++++++++++++++------------------
> > > ----
> > > > -----
> > > > - 1 file changed, 67 insertions(+), 67 deletions(-)
> > > > -
> > > > -diff --git a/inet.defn b/inet.defn
> > > > -index 182b56b..31067bc 100644
> > > > ---- a/inet.defn
> > > > -+++ b/inet.defn
> > > > -@@ -6,10 +6,10 @@ method loopback
> > > > - This method may be used to define the IPv4 loopback
> > > interface.
> > > > -
> > > > - up
> > > > -- /bin/ip link set dev %iface% up if (!iface_is_lo())
> > > > -+ ip link set dev %iface% up if (!iface_is_lo())
> > > > -
> > > > - down
> > > > -- /bin/ip link set dev %iface% down if (!iface_is_lo())
> > > > -+ ip link set dev %iface% down if (!iface_is_lo())
> > > > -
> > > > - method static
> > > > - description
> > > > -@@ -36,17 +36,17 @@ method static
> > > > - broadcast compute_v4_broadcast
> > > > -
> > > > - up
> > > > -- /bin/ip addr add %address%[[/%netmask%]] [[broadcast
> > > > %broadcast%]] \
> > > > -+ ip addr add %address%[[/%netmask%]] [[broadcast
> > > %broadcast%]] \
> > > > - [[peer %pointopoint%]] [[scope %scope%]] dev %iface% label
> > > > %iface%
> > > > -- /bin/ip link set dev %iface% [[mtu %mtu%]] [[address
> > > > %hwaddress%]] up
> > > > -+ ip link set dev %iface% [[mtu %mtu%]] [[address
> > > %hwaddress%]]
> > > > up
> > > > -
> > > > -- [[ /bin/ip route add default via %gateway% [[metric
> > > %metric%]]
> > > > dev %iface% onlink ]]
> > > > -+ [[ ip route add default via %gateway% [[metric %metric%]]
> > > dev
> > > > %iface% onlink ]]
> > > > -
> > > > - down
> > > > -- [[ /bin/ip route del default via %gateway% [[metric
> > > %metric%]]
> > > > dev %iface% 2>&1 1>/dev/null || true ]]
> > > > -- /bin/ip addr del %address%[[/%netmask%]] [[broadcast
> > > > %broadcast%]] \
> > > > -+ [[ ip route del default via %gateway% [[metric %metric%]]
> > > dev
> > > > %iface% 2>&1 1>/dev/null || true ]]
> > > > -+ ip addr del %address%[[/%netmask%]] [[broadcast
> > > %broadcast%]] \
> > > > - [[peer %pointopoint%]] [[scope %scope%]] dev %iface% label
> > > > %iface%
> > > > -- /bin/ip link set dev %iface% down \
> > > > -+ ip link set dev %iface% down \
> > > > - if (iface_is_link())
> > > > -
> > > > - method manual
> > > > -@@ -63,12 +63,12 @@ method manual
> > > > - hwaddress cleanup_hwaddress
> > > > -
> > > > - up
> > > > -- [[/bin/ip link set dev %iface% mtu %mtu%]]
> > > > -- [[/bin/ip link set dev %iface% address %hwaddress%]]
> > > > -- /bin/ip link set dev %iface% up 2>/dev/null || true
> > > > -+ [[ip link set dev %iface% mtu %mtu%]]
> > > > -+ [[ip link set dev %iface% address %hwaddress%]]
> > > > -+ ip link set dev %iface% up 2>/dev/null || true
> > > > -
> > > > - down
> > > > -- /bin/ip link set dev %iface% down 2>/dev/null || true \
> > > > -+ ip link set dev %iface% down 2>/dev/null || true \
> > > > - if (iface_is_link() && !do_all)
> > > > -
> > > > - method dhcp
> > > > -@@ -93,33 +93,33 @@ method dhcp
> > > > - hwaddress cleanup_hwaddress
> > > > -
> > > > - up
> > > > -- [[/bin/ip link set dev %iface% address %hwaddress%]]
> > > > -- /sbin/dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf
> > > > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > > > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > > > -+ [[ip link set dev %iface% address %hwaddress%]]
> > > > -+ dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf
> > > > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > > > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > > > - [[-e IF_METRIC=%metric%]] \
> > > > - if (execable("/sbin/dhclient"))
> > > > -- /sbin/pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]]
> > > \
> > > > -+ pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \
> > > > - elsif (execable("/sbin/pump"))
> > > > -- /sbin/udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-x
> > > > hostname:%hostname%]] \
> > > > -+ udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-x
> > > > hostname:%hostname%]] \
> > > > - elsif (execable("/sbin/udhcpc"))
> > > > -- /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I
> > > %client%]]
> > > > \
> > > > -+ dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
> > > > - [[-l %leasetime%]] [[-m %metric%]] %iface% \
> > > > - elsif (execable("/sbin/dhcpcd"))
> > > > - echo 'No DHCP client software found!' >/dev/stderr; false \
> > > > - elsif (1)
> > > > -
> > > > - down
> > > > -- /sbin/dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf
> > > > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > > > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > > > -+ dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf
> > > > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > > > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > > > - if (execable("/sbin/dhclient"))
> > > > -- /sbin/pump -i %iface% -r \
> > > > -+ pump -i %iface% -r \
> > > > - elsif (execable("/sbin/pump"))
> > > > - if test -f /run/udhcpc.%iface%.pid; then kill -USR2
> > > $(/bin/cat
> > > > /run/udhcpc.%iface%.pid); kill -TERM $(/bin/cat
> > > > /run/udhcpc.%iface%.pid); fi \
> > > > - elsif (execable("/sbin/udhcpc"))
> > > > -- /sbin/dhcpcd -k %iface% \
> > > > -+ dhcpcd -k %iface% \
> > > > - elsif (execable("/sbin/dhcpcd"))
> > > > - echo 'No DHCP client software found!' >/dev/stderr; false \
> > > > - elsif (1)
> > > > -
> > > > -- /bin/ip link set dev %iface% down \
> > > > -+ ip link set dev %iface% down \
> > > > - if (iface_is_link())
> > > > -
> > > > - method bootp
> > > > -@@ -134,11 +134,11 @@ method bootp
> > > > - whatever it really is.
> > > > -
> > > > - up
> > > > -- /sbin/bootpc [[--bootfile %bootfile%]] --dev %iface% [[
> > > --server
> > > > %server%]] \
> > > > -+ bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server
> > > > %server%]] \
> > > > - [[--hwaddr %hwaddr%]] --returniffail --serverbcast
> > > > -
> > > > - down
> > > > -- /bin/ip link set dev %iface% down \
> > > > -+ ip link set dev %iface% down \
> > > > - if (iface_is_link())
> > > > -
> > > > - method tunnel
> > > > -@@ -158,13 +158,13 @@ method tunnel
> > > > - ttl time -- TTL setting
> > > > - mtu size -- MTU size
> > > > - up
> > > > -- /bin/ip tunnel add %iface% mode %mode% remote %endpoint%
> > > > [[local %local%]] \
> > > > -+ ip tunnel add %iface% mode %mode% remote %endpoint% [[local
> > > > %local%]] \
> > > > - [[ttl %ttl%]]
> > > > -- /bin/ip link set %iface% up [[mtu %mtu%]]
> > > > -- /bin/ip addr add %address%/%netmask% dev %iface% [[peer
> > > > %dstaddr%]]
> > > > -- [[ /bin/ip route add default via %gateway% [[metric
> > > %metric%]]
> > > > dev %iface% onlink ]]
> > > > -+ ip link set %iface% up [[mtu %mtu%]]
> > > > -+ ip addr add %address%/%netmask% dev %iface% [[peer
> > > %dstaddr%]]
> > > > -+ [[ ip route add default via %gateway% [[metric %metric%]]
> > > dev
> > > > %iface% onlink ]]
> > > > - down
> > > > -- /bin/ip tunnel del %iface%
> > > > -+ ip tunnel del %iface%
> > > > -
> > > > - method ppp
> > > > - description
> > > > -@@ -175,9 +175,9 @@ method ppp
> > > > - unit number -- Use /number/ as the ppp unit number.
> > > > - options string -- Pass /string/ as additional options to
> > > pon.
> > > > - up
> > > > -- /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]]
> > > > -+ pon [[%provider%]] [[unit %unit%]] [[%options%]]
> > > > - down
> > > > -- /usr/bin/poff [[%provider%]]
> > > > -+ poff [[%provider%]]
> > > > -
> > > > - method wvdial
> > > > - description
> > > > -@@ -186,10 +186,10 @@ method wvdial
> > > > - options
> > > > - provider name -- Use /name/ as the provider (from
> > > > /etc/wvdial.conf).
> > > > - up
> > > > -- /sbin/start-stop-daemon --start -x /usr/bin/wvdial \
> > > > -+ start-stop-daemon --start -x /usr/bin/wvdial \
> > > > - -p /run/wvdial.%iface%.pid -b -m -- [[
> > > > %provider% ]]
> > > > - down
> > > > -- /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \
> > > > -+ start-stop-daemon --stop -x /usr/bin/wvdial \
> > > > - -p /run/wvdial.%iface%.pid -s 2
> > > > -
> > > > -
> > > > -@@ -200,9 +200,9 @@ method ipv4ll
> > > > - known as APIPA or IPAC, and often colloquially referred to
> > > > - as "Zeroconf address".
> > > > - up
> > > > -- /usr/sbin/avahi-autoipd -D %iface%
> > > > -+ avahi-autoipd -D %iface%
> > > > - down
> > > > -- /usr/sbin/avahi-autoipd --kill %iface%
> > > > -+ avahi-autoipd --kill %iface%
> > > > -
> > > > - architecture kfreebsd
> > > > -
> > > > -@@ -211,11 +211,11 @@ method loopback
> > > > - This method may be used to define the IPv4 loopback
> > > interface.
> > > > -
> > > > - up
> > > > -- /sbin/ifconfig %iface% 127.0.0.1 up \
> > > > -+ ifconfig %iface% 127.0.0.1 up \
> > > > - if (!iface_is_lo())
> > > > -
> > > > - down
> > > > -- /sbin/ifconfig %iface% down \
> > > > -+ ifconfig %iface% down \
> > > > - if (!iface_is_lo())
> > > > -
> > > > - method static
> > > > -@@ -238,15 +238,15 @@ method static
> > > > - hwaddress cleanup_hwaddress
> > > > -
> > > > - up
> > > > -- [[ /sbin/ifconfig %iface% link %hwaddress%]]
> > > > -- /sbin/ifconfig %iface% %address% [[netmask %netmask%]]
> > > > [[broadcast %broadcast%]] \
> > > > -+ [[ ifconfig %iface% link %hwaddress%]]
> > > > -+ ifconfig %iface% %address% [[netmask %netmask%]]
> > > [[broadcast
> > > > %broadcast%]] \
> > > > - [[pointopoint %pointopoint%]] [[media %media%]] [[mtu
> > > %mtu%]] \
> > > > - up
> > > > -- [[ /sbin/route add default %gateway% ]]
> > > > -+ [[ route add default %gateway% ]]
> > > > -
> > > > - down
> > > > -- [[ /sbin/route del default %gateway% 2>&1 1>/dev/null ||
> > > true
> > > > ]]
> > > > -- /sbin/ifconfig %iface% down
> > > > -+ [[ route del default %gateway% 2>&1 1>/dev/null || true ]]
> > > > -+ ifconfig %iface% down
> > > > -
> > > > - method manual
> > > > - description
> > > > -@@ -279,30 +279,30 @@ method dhcp
> > > > - hwaddress cleanup_hwaddress
> > > > -
> > > > - up
> > > > -- [[/sbin/ifconfig %iface% link %hwaddress%]]
> > > > -- /sbin/dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf
> > > > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > > > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > > > -+ [[ifconfig %iface% link %hwaddress%]]
> > > > -+ dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf
> > > > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > > > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > > > - [[-e IF_METRIC=%metric%]] \
> > > > - if (execable("/sbin/dhclient"))
> > > > -- /sbin/udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-H
> > > > %hostname%]] \
> > > > -+ udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-H
> > > > %hostname%]] \
> > > > - [[-c %client%]] \
> > > > - elsif (execable("/sbin/udhcpc"))
> > > > -- /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I
> > > %client%]]
> > > > \
> > > > -+ dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
> > > > - [[-l %leasetime%]] %iface% \
> > > > - elsif (execable("/sbin/dhcpcd"))
> > > > - echo 'No DHCP client software found!' >/dev/stderr; false \
> > > > - elsif (1)
> > > > -
> > > > - down
> > > > -- /sbin/dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf
> > > > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > > > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > > > -+ dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf
> > > > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > > > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > > > - if (execable("/sbin/dhclient"))
> > > > - if test -f /run/udhcpc.%iface%.pid; then kill -USR2
> > > $(/bin/cat
> > > > /run/udhcpc.%iface%.pid); kill -TERM $(/bin/cat
> > > > /run/udhcpc.%iface%.pid); fi \
> > > > - elsif (execable("/sbin/udhcpc"))
> > > > -- /sbin/dhcpcd -k %iface% \
> > > > -+ dhcpcd -k %iface% \
> > > > - elsif (execable("/sbin/dhcpcd"))
> > > > - echo 'No DHCP client software found!' >/dev/stderr; false \
> > > > - elsif (1)
> > > > -
> > > > -- /sbin/ifconfig %iface% down
> > > > -+ ifconfig %iface% down
> > > > -
> > > > - method bootp
> > > > - description
> > > > -@@ -316,11 +316,11 @@ method bootp
> > > > - whatever it really is.
> > > > -
> > > > - up
> > > > -- /sbin/bootpc [[--bootfile %bootfile%]] --dev %iface% [[
> > > --server
> > > > %server%]] \
> > > > -+ bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server
> > > > %server%]] \
> > > > - [[--hwaddr %hwaddr%]] --returniffail --serverbcast
> > > > -
> > > > - down
> > > > -- /sbin/ifconfig %iface% down
> > > > -+ ifconfig %iface% down
> > > > -
> > > > - method ppp
> > > > - description
> > > > -@@ -331,9 +331,9 @@ method ppp
> > > > - unit number -- Use /number/ as the ppp unit number.
> > > > - options string -- Pass /string/ as additional options to
> > > pon.
> > > > - up
> > > > -- /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]]
> > > > -+ pon [[%provider%]] [[unit %unit%]] [[%options%]]
> > > > - down
> > > > -- /usr/bin/poff [[%provider%]]
> > > > -+ poff [[%provider%]]
> > > > -
> > > > - method wvdial
> > > > - description
> > > > -@@ -342,10 +342,10 @@ method wvdial
> > > > - options
> > > > - provider name -- Use /name/ as the provider (from
> > > > /etc/wvdial.conf).
> > > > - up
> > > > -- /sbin/start-stop-daemon --start -x /usr/bin/wvdial \
> > > > -+ start-stop-daemon --start -x /usr/bin/wvdial \
> > > > - -p /run/wvdial.%iface%.pid -b -m -- [[
> > > > %provider% ]]
> > > > - down
> > > > -- /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \
> > > > -+ start-stop-daemon --stop -x /usr/bin/wvdial \
> > > > - -p /run/wvdial.%iface%.pid -s 2
> > > > -
> > > > -
> > > > -@@ -356,9 +356,9 @@ method ipv4ll
> > > > - known as APIPA or IPAC, and often colloquially referred to
> > > > - as "Zeroconf address".
> > > > - up
> > > > -- /usr/sbin/avahi-autoipd -D %iface%
> > > > -+ avahi-autoipd -D %iface%
> > > > - down
> > > > -- /usr/sbin/avahi-autoipd --kill %iface%
> > > > -+ avahi-autoipd --kill %iface%
> > > > - architecture hurd
> > > > -
> > > > - method loopback
> > > > -@@ -432,23 +432,23 @@ method dhcp
> > > > -
> > > > - up
> > > > - [[Warning: Option hwaddress: %hwaddress% not yet
> > > supported]]
> > > > -- /sbin/dhclient -4 -v -pf /run/dhclient.%iface///.%.pid -lf
> > > > /var/lib/dhcp/dhclient.%iface///.%.leases -I -df
> > > > /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
> > > > -+ dhclient -4 -v -pf /run/dhclient.%iface///.%.pid -lf
> > > > /var/lib/dhcp/dhclient.%iface///.%.leases -I -df
> > > > /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
> > > > - if (execable("/sbin/dhclient"))
> > > > -- /sbin/udhcpc -n -p /run/udhcpc.%iface///.%.pid -i %iface%
> > > [[-H
> > > > %hostname%]] \
> > > > -+ udhcpc -n -p /run/udhcpc.%iface///.%.pid -i %iface% [[-H
> > > > %hostname%]] \
> > > > - [[-c %client%]] \
> > > > - elsif (execable("/sbin/udhcpc"))
> > > > -- /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I
> > > %client%]]
> > > > \
> > > > -+ dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
> > > > - [[-l %leasetime%]] %iface% \
> > > > - elsif (execable("/sbin/dhcpcd"))
> > > > - echo 'No DHCP client software found!' >/dev/stderr; false \
> > > > - elsif (1)
> > > > -
> > > > - down
> > > > -- /sbin/dhclient -4 -v -r -pf /run/dhclient.%iface///.%.pid
> > > -lf
> > > > /var/lib/dhcp/dhclient.%iface///.%.leases -I -df
> > > > /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
> > > > -+ dhclient -4 -v -r -pf /run/dhclient.%iface///.%.pid -lf
> > > > /var/lib/dhcp/dhclient.%iface///.%.leases -I -df
> > > > /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
> > > > - if (execable("/sbin/dhclient"))
> > > > - if test -f /run/udhcpc.%iface///.%.pid; then kill -USR2
> > > > $(/bin/cat /run/udhcpc.%iface///.%.pid); kill -TERM $(/bin/cat
> > > > /run/udhcpc.%iface///.%.pid); fi \
> > > > - elsif (execable("/sbin/udhcpc"))
> > > > -- /sbin/dhcpcd -k %iface% \
> > > > -+ dhcpcd -k %iface% \
> > > > - elsif (execable("/sbin/dhcpcd"))
> > > > - echo 'No DHCP client software found!' >/dev/stderr; false \
> > > > - elsif (1)
> > > > -@@ -482,9 +482,9 @@ method ppp
> > > > - unit number -- Use /number/ as the ppp unit number.
> > > > - options string -- Pass /string/ as additional options to
> > > pon.
> > > > - up
> > > > -- /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]]
> > > > -+ pon [[%provider%]] [[unit %unit%]] [[%options%]]
> > > > - down
> > > > -- /usr/bin/poff [[%provider%]]
> > > > -+ poff [[%provider%]]
> > > > -
> > > > - method wvdial
> > > > - description
> > > > -@@ -493,10 +493,10 @@ method wvdial
> > > > - options
> > > > - provider name -- Use /name/ as the provider (from
> > > > /etc/wvdial.conf).
> > > > - up
> > > > -- /sbin/start-stop-daemon --start -x /usr/bin/wvdial \
> > > > -+ start-stop-daemon --start -x /usr/bin/wvdial \
> > > > - -p /run/wvdial.%iface///.%.pid -b -m --
> > > [[
> > > > %provider% ]]
> > > > - down
> > > > -- /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \
> > > > -+ start-stop-daemon --stop -x /usr/bin/wvdial \
> > > > - -p /run/wvdial.%iface///.%.pid -s 2
> > > > -
> > > > -
> > > > -@@ -507,6 +507,6 @@ method ipv4ll
> > > > - known as APIPA or IPAC, and often colloquially referred to
> > > > - as "Zeroconf address".
> > > > - up
> > > > -- /usr/sbin/avahi-autoipd -D %iface%
> > > > -+ avahi-autoipd -D %iface%
> > > > - down
> > > > -- /usr/sbin/avahi-autoipd --kill %iface%
> > > > -+ avahi-autoipd --kill %iface%
> > > > ---
> > > > -2.17.1
> > > > -
> > > > diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.22.bb
> > > > b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb
> > > > similarity index 83%
> > > > rename from meta/recipes-core/ifupdown/ifupdown_0.8.22.bb
> > > > rename to meta/recipes-core/ifupdown/ifupdown_0.8.35.bb
> > > > index bd0989e8855..de8e1cf66ba 100644
> > > > --- a/meta/recipes-core/ifupdown/ifupdown_0.8.22.bb
> > > > +++ b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb
> > > > @@ -7,12 +7,11 @@ LICENSE = "GPLv2"
> > > > LIC_FILES_CHKSUM =
> > > > "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
> > > >
> > > > SRC_URI =
> > > "git://salsa.debian.org/debian/ifupdown.git;protocol=https
> > > > \
> > > > - file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-
> > > set-
> > > > a.patch \
> > > > - file://inet-6-.defn-fix-inverted-checks-for-
> > > loopback.patch \
> > > > - file://99_network \
> > > > - file://0001-Define-FNM_EXTMATCH-for-musl.patch \
> > > > - "
> > > > -SRCREV = "ab5a0f464e53e172316a5ca8b5dcdc49e8848999"
> > > > + file://defn2-c-man-don-t-rely-on-dpkg-architecture-
> > > to-
> > > > set-a.patch \
> > > > + file://99_network \
> > > > + file://0001-Define-FNM_EXTMATCH-for-musl.patch \
> > > > + "
> > > > +SRCREV = "4af76318cfc57f8e4a44d357104188666213bd4b"
> > > >
> > > > S = "${WORKDIR}/git"
> > > >
> > > > --
> > > > 2.17.1
> > > >
> > >
>
>
[-- Attachment #2: Type: text/html, Size: 34339 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PATCH 02/16] ifupdown: update 0.8.22 -> 0.8.35
2019-12-19 17:18 ` Khem Raj
2019-12-19 17:22 ` Alexander Kanavin
@ 2019-12-20 15:32 ` Paul Gortmaker
1 sibling, 0 replies; 23+ messages in thread
From: Paul Gortmaker @ 2019-12-20 15:32 UTC (permalink / raw)
To: Khem Raj; +Cc: OE-core
[Re: [OE-core] [PATCH 02/16] ifupdown: update 0.8.22 -> 0.8.35] On 19/12/2019 (Thu 09:18) Khem Raj wrote:
> On Thu, 2019-12-19 at 18:12 +0100, Alexander Kanavin wrote:
> > Sure, added them.
> >
> > I booted a system without the patch, and the network did go up
> > without errors.
> >
> > If the patch is still relevant, I would suggest that an effort is
> > made to get it upstream. It will continue to be difficult to rebase.
> >
>
> I dont disagree. Until then I also worry that we might regress on what
> we have provided to end user. So it will help in getting more info
> either way.
The commit log shows the low level failure, so I cant add a lot to that.
What I can say, is that the bug caused some kind of an issue with
sysVinit. The patch originally was in the meta-overc layer, but since
it stopped supporting sysVinit, the patch and other traces of ifupdown
were removed there over a year ago.
P.
--
>
>
> > Alex
> >
> > On Thu, 19 Dec 2019 at 18:03, Khem Raj <raj.khem@gmail.com> wrote:
> > > On Thu, 2019-12-19 at 14:22 +0100, Alexander Kanavin wrote:
> > > > Remove inet-6-.defn-fix-inverted-checks-for-loopback.patch as
> > > > it is difficult to rebase and not clear if still necessary.
> > > >
> > >
> > > perhaps Cc the patch authors and get an opinion ?
> > >
> > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > > > ---
> > > > ...efn-fix-inverted-checks-for-loopback.patch | 403 ------------
> > > ----
> > > > --
> > > > ...{ifupdown_0.8.22.bb => ifupdown_0.8.35.bb} | 11 +-
> > > > 2 files changed, 5 insertions(+), 409 deletions(-)
> > > > delete mode 100644 meta/recipes-core/ifupdown/files/inet-6-
> > > .defn-
> > > > fix-inverted-checks-for-loopback.patch
> > > > rename meta/recipes-core/ifupdown/{ifupdown_0.8.22.bb =>
> > > > ifupdown_0.8.35.bb} (83%)
> > > >
> > > > diff --git a/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-
> > > > inverted-checks-for-loopback.patch b/meta/recipes-
> > > > core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-
> > > > loopback.patch
> > > > deleted file mode 100644
> > > > index 5b0d51d736f..00000000000
> > > > --- a/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-
> > > > checks-for-loopback.patch
> > > > +++ /dev/null
> > > > @@ -1,403 +0,0 @@
> > > > -From 6fce99c9e42cbacde1855473b745ca1fded3fbf7 Mon Sep 17
> > > 00:00:00
> > > > 2001
> > > > -From: "Maxin B. John" <maxin.john@intel.com>
> > > > -Date: Wed, 21 Dec 2016 15:32:07 +0200
> > > > -Subject: [PATCH 2/2] inet[6].defn: fix inverted checks for
> > > loopback
> > > > -
> > > > -Compared to the hurd link.defn for loopback, we see these
> > > > -are inverted, meaning that you would only be able to configure
> > > > -a loopback device that was _not_ named "lo" (unlikely to exist).
> > > > -
> > > > -The result was that we'd update /run/network/ifstate for "lo"
> > > > -but never actually do anything for up/down, as shown below:
> > > > -
> > > > -root@localhost:~# ifconfig -s
> > > > -Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-
> > > DRP
> > > > TX-OVR Flg
> > > > -eth0 1500 0 7736329 0 2016 0
> > > > 5289422 0 0 0 BMRU
> > > > -lo 65536 0 18 0 0
> > > > 0 18 0 0 0 LRU
> > > > -root@localhost:~# ifdown lo
> > > > -root@localhost:~# echo $?
> > > > -0
> > > > -root@localhost:~# ifconfig -s
> > > > -Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR
> > > TX-DRP
> > > > TX-OVR Flg
> > > > -eth0 1500 0 7736406 0 2016
> > > > 0 5289455 0 0 0 BMRU
> > > > -lo 65536 0 18 0 0
> > > > 0 18 0 0 0 LRU
> > > > -root@localhost:~# ifconfig lo down
> > > > -root@localhost:~# ifconfig -s
> > > > -Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-
> > > DRP
> > > > TX-OVR Flg
> > > > -eth0 1500 0 7736474 0 2016
> > > > 0 5289481 0 0 0 BMRU
> > > > -root@localhost:~#
> > > > -
> > > > -Also reverted the commit:
> > > > -commit 80b878497663dae08f70b4d3cffe127b57a3cfc
> > > > -which uses absolute paths to binaries called by ifup/ifdown.
> > > > -
> > > > -Upstream-Status: Inappropriate [OE specific]
> > > > -
> > > > -Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> > > > -Signed-off-by: Maxin B. John <maxin.john@intel.com>
> > > > -Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> > > > ----
> > > > - inet.defn | 134 +++++++++++++++++++++++++++------------------
> > > ----
> > > > -----
> > > > - 1 file changed, 67 insertions(+), 67 deletions(-)
> > > > -
> > > > -diff --git a/inet.defn b/inet.defn
> > > > -index 182b56b..31067bc 100644
> > > > ---- a/inet.defn
> > > > -+++ b/inet.defn
> > > > -@@ -6,10 +6,10 @@ method loopback
> > > > - This method may be used to define the IPv4 loopback
> > > interface.
> > > > -
> > > > - up
> > > > -- /bin/ip link set dev %iface% up if (!iface_is_lo())
> > > > -+ ip link set dev %iface% up if (!iface_is_lo())
> > > > -
> > > > - down
> > > > -- /bin/ip link set dev %iface% down if (!iface_is_lo())
> > > > -+ ip link set dev %iface% down if (!iface_is_lo())
> > > > -
> > > > - method static
> > > > - description
> > > > -@@ -36,17 +36,17 @@ method static
> > > > - broadcast compute_v4_broadcast
> > > > -
> > > > - up
> > > > -- /bin/ip addr add %address%[[/%netmask%]] [[broadcast
> > > > %broadcast%]] \
> > > > -+ ip addr add %address%[[/%netmask%]] [[broadcast
> > > %broadcast%]] \
> > > > - [[peer %pointopoint%]] [[scope %scope%]] dev %iface% label
> > > > %iface%
> > > > -- /bin/ip link set dev %iface% [[mtu %mtu%]] [[address
> > > > %hwaddress%]] up
> > > > -+ ip link set dev %iface% [[mtu %mtu%]] [[address
> > > %hwaddress%]]
> > > > up
> > > > -
> > > > -- [[ /bin/ip route add default via %gateway% [[metric
> > > %metric%]]
> > > > dev %iface% onlink ]]
> > > > -+ [[ ip route add default via %gateway% [[metric %metric%]]
> > > dev
> > > > %iface% onlink ]]
> > > > -
> > > > - down
> > > > -- [[ /bin/ip route del default via %gateway% [[metric
> > > %metric%]]
> > > > dev %iface% 2>&1 1>/dev/null || true ]]
> > > > -- /bin/ip addr del %address%[[/%netmask%]] [[broadcast
> > > > %broadcast%]] \
> > > > -+ [[ ip route del default via %gateway% [[metric %metric%]]
> > > dev
> > > > %iface% 2>&1 1>/dev/null || true ]]
> > > > -+ ip addr del %address%[[/%netmask%]] [[broadcast
> > > %broadcast%]] \
> > > > - [[peer %pointopoint%]] [[scope %scope%]] dev %iface% label
> > > > %iface%
> > > > -- /bin/ip link set dev %iface% down \
> > > > -+ ip link set dev %iface% down \
> > > > - if (iface_is_link())
> > > > -
> > > > - method manual
> > > > -@@ -63,12 +63,12 @@ method manual
> > > > - hwaddress cleanup_hwaddress
> > > > -
> > > > - up
> > > > -- [[/bin/ip link set dev %iface% mtu %mtu%]]
> > > > -- [[/bin/ip link set dev %iface% address %hwaddress%]]
> > > > -- /bin/ip link set dev %iface% up 2>/dev/null || true
> > > > -+ [[ip link set dev %iface% mtu %mtu%]]
> > > > -+ [[ip link set dev %iface% address %hwaddress%]]
> > > > -+ ip link set dev %iface% up 2>/dev/null || true
> > > > -
> > > > - down
> > > > -- /bin/ip link set dev %iface% down 2>/dev/null || true \
> > > > -+ ip link set dev %iface% down 2>/dev/null || true \
> > > > - if (iface_is_link() && !do_all)
> > > > -
> > > > - method dhcp
> > > > -@@ -93,33 +93,33 @@ method dhcp
> > > > - hwaddress cleanup_hwaddress
> > > > -
> > > > - up
> > > > -- [[/bin/ip link set dev %iface% address %hwaddress%]]
> > > > -- /sbin/dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf
> > > > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > > > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > > > -+ [[ip link set dev %iface% address %hwaddress%]]
> > > > -+ dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf
> > > > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > > > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > > > - [[-e IF_METRIC=%metric%]] \
> > > > - if (execable("/sbin/dhclient"))
> > > > -- /sbin/pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]]
> > > \
> > > > -+ pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \
> > > > - elsif (execable("/sbin/pump"))
> > > > -- /sbin/udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-x
> > > > hostname:%hostname%]] \
> > > > -+ udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-x
> > > > hostname:%hostname%]] \
> > > > - elsif (execable("/sbin/udhcpc"))
> > > > -- /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I
> > > %client%]]
> > > > \
> > > > -+ dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
> > > > - [[-l %leasetime%]] [[-m %metric%]] %iface% \
> > > > - elsif (execable("/sbin/dhcpcd"))
> > > > - echo 'No DHCP client software found!' >/dev/stderr; false \
> > > > - elsif (1)
> > > > -
> > > > - down
> > > > -- /sbin/dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf
> > > > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > > > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > > > -+ dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf
> > > > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > > > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > > > - if (execable("/sbin/dhclient"))
> > > > -- /sbin/pump -i %iface% -r \
> > > > -+ pump -i %iface% -r \
> > > > - elsif (execable("/sbin/pump"))
> > > > - if test -f /run/udhcpc.%iface%.pid; then kill -USR2
> > > $(/bin/cat
> > > > /run/udhcpc.%iface%.pid); kill -TERM $(/bin/cat
> > > > /run/udhcpc.%iface%.pid); fi \
> > > > - elsif (execable("/sbin/udhcpc"))
> > > > -- /sbin/dhcpcd -k %iface% \
> > > > -+ dhcpcd -k %iface% \
> > > > - elsif (execable("/sbin/dhcpcd"))
> > > > - echo 'No DHCP client software found!' >/dev/stderr; false \
> > > > - elsif (1)
> > > > -
> > > > -- /bin/ip link set dev %iface% down \
> > > > -+ ip link set dev %iface% down \
> > > > - if (iface_is_link())
> > > > -
> > > > - method bootp
> > > > -@@ -134,11 +134,11 @@ method bootp
> > > > - whatever it really is.
> > > > -
> > > > - up
> > > > -- /sbin/bootpc [[--bootfile %bootfile%]] --dev %iface% [[
> > > --server
> > > > %server%]] \
> > > > -+ bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server
> > > > %server%]] \
> > > > - [[--hwaddr %hwaddr%]] --returniffail --serverbcast
> > > > -
> > > > - down
> > > > -- /bin/ip link set dev %iface% down \
> > > > -+ ip link set dev %iface% down \
> > > > - if (iface_is_link())
> > > > -
> > > > - method tunnel
> > > > -@@ -158,13 +158,13 @@ method tunnel
> > > > - ttl time -- TTL setting
> > > > - mtu size -- MTU size
> > > > - up
> > > > -- /bin/ip tunnel add %iface% mode %mode% remote %endpoint%
> > > > [[local %local%]] \
> > > > -+ ip tunnel add %iface% mode %mode% remote %endpoint% [[local
> > > > %local%]] \
> > > > - [[ttl %ttl%]]
> > > > -- /bin/ip link set %iface% up [[mtu %mtu%]]
> > > > -- /bin/ip addr add %address%/%netmask% dev %iface% [[peer
> > > > %dstaddr%]]
> > > > -- [[ /bin/ip route add default via %gateway% [[metric
> > > %metric%]]
> > > > dev %iface% onlink ]]
> > > > -+ ip link set %iface% up [[mtu %mtu%]]
> > > > -+ ip addr add %address%/%netmask% dev %iface% [[peer
> > > %dstaddr%]]
> > > > -+ [[ ip route add default via %gateway% [[metric %metric%]]
> > > dev
> > > > %iface% onlink ]]
> > > > - down
> > > > -- /bin/ip tunnel del %iface%
> > > > -+ ip tunnel del %iface%
> > > > -
> > > > - method ppp
> > > > - description
> > > > -@@ -175,9 +175,9 @@ method ppp
> > > > - unit number -- Use /number/ as the ppp unit number.
> > > > - options string -- Pass /string/ as additional options to
> > > pon.
> > > > - up
> > > > -- /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]]
> > > > -+ pon [[%provider%]] [[unit %unit%]] [[%options%]]
> > > > - down
> > > > -- /usr/bin/poff [[%provider%]]
> > > > -+ poff [[%provider%]]
> > > > -
> > > > - method wvdial
> > > > - description
> > > > -@@ -186,10 +186,10 @@ method wvdial
> > > > - options
> > > > - provider name -- Use /name/ as the provider (from
> > > > /etc/wvdial.conf).
> > > > - up
> > > > -- /sbin/start-stop-daemon --start -x /usr/bin/wvdial \
> > > > -+ start-stop-daemon --start -x /usr/bin/wvdial \
> > > > - -p /run/wvdial.%iface%.pid -b -m -- [[
> > > > %provider% ]]
> > > > - down
> > > > -- /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \
> > > > -+ start-stop-daemon --stop -x /usr/bin/wvdial \
> > > > - -p /run/wvdial.%iface%.pid -s 2
> > > > -
> > > > -
> > > > -@@ -200,9 +200,9 @@ method ipv4ll
> > > > - known as APIPA or IPAC, and often colloquially referred to
> > > > - as "Zeroconf address".
> > > > - up
> > > > -- /usr/sbin/avahi-autoipd -D %iface%
> > > > -+ avahi-autoipd -D %iface%
> > > > - down
> > > > -- /usr/sbin/avahi-autoipd --kill %iface%
> > > > -+ avahi-autoipd --kill %iface%
> > > > -
> > > > - architecture kfreebsd
> > > > -
> > > > -@@ -211,11 +211,11 @@ method loopback
> > > > - This method may be used to define the IPv4 loopback
> > > interface.
> > > > -
> > > > - up
> > > > -- /sbin/ifconfig %iface% 127.0.0.1 up \
> > > > -+ ifconfig %iface% 127.0.0.1 up \
> > > > - if (!iface_is_lo())
> > > > -
> > > > - down
> > > > -- /sbin/ifconfig %iface% down \
> > > > -+ ifconfig %iface% down \
> > > > - if (!iface_is_lo())
> > > > -
> > > > - method static
> > > > -@@ -238,15 +238,15 @@ method static
> > > > - hwaddress cleanup_hwaddress
> > > > -
> > > > - up
> > > > -- [[ /sbin/ifconfig %iface% link %hwaddress%]]
> > > > -- /sbin/ifconfig %iface% %address% [[netmask %netmask%]]
> > > > [[broadcast %broadcast%]] \
> > > > -+ [[ ifconfig %iface% link %hwaddress%]]
> > > > -+ ifconfig %iface% %address% [[netmask %netmask%]]
> > > [[broadcast
> > > > %broadcast%]] \
> > > > - [[pointopoint %pointopoint%]] [[media %media%]] [[mtu
> > > %mtu%]] \
> > > > - up
> > > > -- [[ /sbin/route add default %gateway% ]]
> > > > -+ [[ route add default %gateway% ]]
> > > > -
> > > > - down
> > > > -- [[ /sbin/route del default %gateway% 2>&1 1>/dev/null ||
> > > true
> > > > ]]
> > > > -- /sbin/ifconfig %iface% down
> > > > -+ [[ route del default %gateway% 2>&1 1>/dev/null || true ]]
> > > > -+ ifconfig %iface% down
> > > > -
> > > > - method manual
> > > > - description
> > > > -@@ -279,30 +279,30 @@ method dhcp
> > > > - hwaddress cleanup_hwaddress
> > > > -
> > > > - up
> > > > -- [[/sbin/ifconfig %iface% link %hwaddress%]]
> > > > -- /sbin/dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf
> > > > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > > > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > > > -+ [[ifconfig %iface% link %hwaddress%]]
> > > > -+ dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf
> > > > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > > > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > > > - [[-e IF_METRIC=%metric%]] \
> > > > - if (execable("/sbin/dhclient"))
> > > > -- /sbin/udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-H
> > > > %hostname%]] \
> > > > -+ udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-H
> > > > %hostname%]] \
> > > > - [[-c %client%]] \
> > > > - elsif (execable("/sbin/udhcpc"))
> > > > -- /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I
> > > %client%]]
> > > > \
> > > > -+ dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
> > > > - [[-l %leasetime%]] %iface% \
> > > > - elsif (execable("/sbin/dhcpcd"))
> > > > - echo 'No DHCP client software found!' >/dev/stderr; false \
> > > > - elsif (1)
> > > > -
> > > > - down
> > > > -- /sbin/dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf
> > > > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > > > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > > > -+ dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf
> > > > /var/lib/dhcp/dhclient.%iface%.leases -I -df
> > > > /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
> > > > - if (execable("/sbin/dhclient"))
> > > > - if test -f /run/udhcpc.%iface%.pid; then kill -USR2
> > > $(/bin/cat
> > > > /run/udhcpc.%iface%.pid); kill -TERM $(/bin/cat
> > > > /run/udhcpc.%iface%.pid); fi \
> > > > - elsif (execable("/sbin/udhcpc"))
> > > > -- /sbin/dhcpcd -k %iface% \
> > > > -+ dhcpcd -k %iface% \
> > > > - elsif (execable("/sbin/dhcpcd"))
> > > > - echo 'No DHCP client software found!' >/dev/stderr; false \
> > > > - elsif (1)
> > > > -
> > > > -- /sbin/ifconfig %iface% down
> > > > -+ ifconfig %iface% down
> > > > -
> > > > - method bootp
> > > > - description
> > > > -@@ -316,11 +316,11 @@ method bootp
> > > > - whatever it really is.
> > > > -
> > > > - up
> > > > -- /sbin/bootpc [[--bootfile %bootfile%]] --dev %iface% [[
> > > --server
> > > > %server%]] \
> > > > -+ bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server
> > > > %server%]] \
> > > > - [[--hwaddr %hwaddr%]] --returniffail --serverbcast
> > > > -
> > > > - down
> > > > -- /sbin/ifconfig %iface% down
> > > > -+ ifconfig %iface% down
> > > > -
> > > > - method ppp
> > > > - description
> > > > -@@ -331,9 +331,9 @@ method ppp
> > > > - unit number -- Use /number/ as the ppp unit number.
> > > > - options string -- Pass /string/ as additional options to
> > > pon.
> > > > - up
> > > > -- /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]]
> > > > -+ pon [[%provider%]] [[unit %unit%]] [[%options%]]
> > > > - down
> > > > -- /usr/bin/poff [[%provider%]]
> > > > -+ poff [[%provider%]]
> > > > -
> > > > - method wvdial
> > > > - description
> > > > -@@ -342,10 +342,10 @@ method wvdial
> > > > - options
> > > > - provider name -- Use /name/ as the provider (from
> > > > /etc/wvdial.conf).
> > > > - up
> > > > -- /sbin/start-stop-daemon --start -x /usr/bin/wvdial \
> > > > -+ start-stop-daemon --start -x /usr/bin/wvdial \
> > > > - -p /run/wvdial.%iface%.pid -b -m -- [[
> > > > %provider% ]]
> > > > - down
> > > > -- /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \
> > > > -+ start-stop-daemon --stop -x /usr/bin/wvdial \
> > > > - -p /run/wvdial.%iface%.pid -s 2
> > > > -
> > > > -
> > > > -@@ -356,9 +356,9 @@ method ipv4ll
> > > > - known as APIPA or IPAC, and often colloquially referred to
> > > > - as "Zeroconf address".
> > > > - up
> > > > -- /usr/sbin/avahi-autoipd -D %iface%
> > > > -+ avahi-autoipd -D %iface%
> > > > - down
> > > > -- /usr/sbin/avahi-autoipd --kill %iface%
> > > > -+ avahi-autoipd --kill %iface%
> > > > - architecture hurd
> > > > -
> > > > - method loopback
> > > > -@@ -432,23 +432,23 @@ method dhcp
> > > > -
> > > > - up
> > > > - [[Warning: Option hwaddress: %hwaddress% not yet
> > > supported]]
> > > > -- /sbin/dhclient -4 -v -pf /run/dhclient.%iface///.%.pid -lf
> > > > /var/lib/dhcp/dhclient.%iface///.%.leases -I -df
> > > > /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
> > > > -+ dhclient -4 -v -pf /run/dhclient.%iface///.%.pid -lf
> > > > /var/lib/dhcp/dhclient.%iface///.%.leases -I -df
> > > > /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
> > > > - if (execable("/sbin/dhclient"))
> > > > -- /sbin/udhcpc -n -p /run/udhcpc.%iface///.%.pid -i %iface%
> > > [[-H
> > > > %hostname%]] \
> > > > -+ udhcpc -n -p /run/udhcpc.%iface///.%.pid -i %iface% [[-H
> > > > %hostname%]] \
> > > > - [[-c %client%]] \
> > > > - elsif (execable("/sbin/udhcpc"))
> > > > -- /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I
> > > %client%]]
> > > > \
> > > > -+ dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
> > > > - [[-l %leasetime%]] %iface% \
> > > > - elsif (execable("/sbin/dhcpcd"))
> > > > - echo 'No DHCP client software found!' >/dev/stderr; false \
> > > > - elsif (1)
> > > > -
> > > > - down
> > > > -- /sbin/dhclient -4 -v -r -pf /run/dhclient.%iface///.%.pid
> > > -lf
> > > > /var/lib/dhcp/dhclient.%iface///.%.leases -I -df
> > > > /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
> > > > -+ dhclient -4 -v -r -pf /run/dhclient.%iface///.%.pid -lf
> > > > /var/lib/dhcp/dhclient.%iface///.%.leases -I -df
> > > > /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
> > > > - if (execable("/sbin/dhclient"))
> > > > - if test -f /run/udhcpc.%iface///.%.pid; then kill -USR2
> > > > $(/bin/cat /run/udhcpc.%iface///.%.pid); kill -TERM $(/bin/cat
> > > > /run/udhcpc.%iface///.%.pid); fi \
> > > > - elsif (execable("/sbin/udhcpc"))
> > > > -- /sbin/dhcpcd -k %iface% \
> > > > -+ dhcpcd -k %iface% \
> > > > - elsif (execable("/sbin/dhcpcd"))
> > > > - echo 'No DHCP client software found!' >/dev/stderr; false \
> > > > - elsif (1)
> > > > -@@ -482,9 +482,9 @@ method ppp
> > > > - unit number -- Use /number/ as the ppp unit number.
> > > > - options string -- Pass /string/ as additional options to
> > > pon.
> > > > - up
> > > > -- /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]]
> > > > -+ pon [[%provider%]] [[unit %unit%]] [[%options%]]
> > > > - down
> > > > -- /usr/bin/poff [[%provider%]]
> > > > -+ poff [[%provider%]]
> > > > -
> > > > - method wvdial
> > > > - description
> > > > -@@ -493,10 +493,10 @@ method wvdial
> > > > - options
> > > > - provider name -- Use /name/ as the provider (from
> > > > /etc/wvdial.conf).
> > > > - up
> > > > -- /sbin/start-stop-daemon --start -x /usr/bin/wvdial \
> > > > -+ start-stop-daemon --start -x /usr/bin/wvdial \
> > > > - -p /run/wvdial.%iface///.%.pid -b -m --
> > > [[
> > > > %provider% ]]
> > > > - down
> > > > -- /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \
> > > > -+ start-stop-daemon --stop -x /usr/bin/wvdial \
> > > > - -p /run/wvdial.%iface///.%.pid -s 2
> > > > -
> > > > -
> > > > -@@ -507,6 +507,6 @@ method ipv4ll
> > > > - known as APIPA or IPAC, and often colloquially referred to
> > > > - as "Zeroconf address".
> > > > - up
> > > > -- /usr/sbin/avahi-autoipd -D %iface%
> > > > -+ avahi-autoipd -D %iface%
> > > > - down
> > > > -- /usr/sbin/avahi-autoipd --kill %iface%
> > > > -+ avahi-autoipd --kill %iface%
> > > > ---
> > > > -2.17.1
> > > > -
> > > > diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.22.bb
> > > > b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb
> > > > similarity index 83%
> > > > rename from meta/recipes-core/ifupdown/ifupdown_0.8.22.bb
> > > > rename to meta/recipes-core/ifupdown/ifupdown_0.8.35.bb
> > > > index bd0989e8855..de8e1cf66ba 100644
> > > > --- a/meta/recipes-core/ifupdown/ifupdown_0.8.22.bb
> > > > +++ b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb
> > > > @@ -7,12 +7,11 @@ LICENSE = "GPLv2"
> > > > LIC_FILES_CHKSUM =
> > > > "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
> > > >
> > > > SRC_URI =
> > > "git://salsa.debian.org/debian/ifupdown.git;protocol=https
> > > > \
> > > > - file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-
> > > set-
> > > > a.patch \
> > > > - file://inet-6-.defn-fix-inverted-checks-for-
> > > loopback.patch \
> > > > - file://99_network \
> > > > - file://0001-Define-FNM_EXTMATCH-for-musl.patch \
> > > > - "
> > > > -SRCREV = "ab5a0f464e53e172316a5ca8b5dcdc49e8848999"
> > > > + file://defn2-c-man-don-t-rely-on-dpkg-architecture-
> > > to-
> > > > set-a.patch \
> > > > + file://99_network \
> > > > + file://0001-Define-FNM_EXTMATCH-for-musl.patch \
> > > > + "
> > > > +SRCREV = "4af76318cfc57f8e4a44d357104188666213bd4b"
> > > >
> > > > S = "${WORKDIR}/git"
> > > >
> > > > --
> > > > 2.17.1
> > > >
> > >
>
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH 03/16] ovmf: update to 201911
2019-12-19 13:22 [PATCH 01/16] resolvconf: update to 1.80 Alexander Kanavin
2019-12-19 13:22 ` [PATCH 02/16] ifupdown: update 0.8.22 -> 0.8.35 Alexander Kanavin
@ 2019-12-19 13:22 ` Alexander Kanavin
2019-12-19 13:22 ` [PATCH 04/16] meson: update 0.52.0 -> 0.52.1 Alexander Kanavin
` (13 subsequent siblings)
15 siblings, 0 replies; 23+ messages in thread
From: Alexander Kanavin @ 2019-12-19 13:22 UTC (permalink / raw)
To: openembedded-core
Remove unused patch.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...vmf-update-path-to-native-BaseTools.patch} | 11 ++++---
...le-adjust-to-build-in-under-bitbake.patch} | 17 +++++-----
... => 0003-ovmf-enable-long-path-file.patch} | 18 +++++++---
...patch => 0004-ovmf-Update-to-latest.patch} | 26 +++++++++++----
...frCompile-increase-path-length-limit.patch | 33 -------------------
meta/recipes-core/ovmf/ovmf_git.bb | 12 +++----
6 files changed, 54 insertions(+), 63 deletions(-)
rename meta/recipes-core/ovmf/ovmf/{0002-ovmf-update-path-to-native-BaseTools.patch => 0001-ovmf-update-path-to-native-BaseTools.patch} (84%)
rename meta/recipes-core/ovmf/ovmf/{0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch => 0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch} (75%)
rename meta/recipes-core/ovmf/ovmf/{0004-ovmf-enable-long-path-file.patch => 0003-ovmf-enable-long-path-file.patch} (54%)
rename meta/recipes-core/ovmf/ovmf/{no-stack-protector-all-archs.patch => 0004-ovmf-Update-to-latest.patch} (82%)
delete mode 100644 meta/recipes-core/ovmf/ovmf/VfrCompile-increase-path-length-limit.patch
diff --git a/meta/recipes-core/ovmf/ovmf/0002-ovmf-update-path-to-native-BaseTools.patch b/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch
similarity index 84%
rename from meta/recipes-core/ovmf/ovmf/0002-ovmf-update-path-to-native-BaseTools.patch
rename to meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch
index 94ae5d4496e..6ecb23b29f4 100644
--- a/meta/recipes-core/ovmf/ovmf/0002-ovmf-update-path-to-native-BaseTools.patch
+++ b/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch
@@ -1,7 +1,7 @@
-From 9e632e3f9edd09632cc877dff6ea57608f979aab Mon Sep 17 00:00:00 2001
+From 0a8362cfb9f00870d70687475665b131dd82c947 Mon Sep 17 00:00:00 2001
From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
Date: Thu, 9 Jun 2016 02:23:01 -0700
-Subject: [PATCH] ovmf: update path to native BaseTools
+Subject: [PATCH 1/5] ovmf: update path to native BaseTools
BaseTools is a set of utilities to build EDK-based firmware. These utilities
are used during the build process. Thus, they need to be built natively.
@@ -11,15 +11,16 @@ with the appropriate location before building.
Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
Upstream-Status: Pending
+
---
OvmfPkg/build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
-index eb5eb73..9058fca 100755
+index 91b1442ade..1858dae31a 100755
--- a/OvmfPkg/build.sh
+++ b/OvmfPkg/build.sh
-@@ -30,7 +30,7 @@ then
+@@ -24,7 +24,7 @@ then
# this assumes svn pulls have the same root dir
# export EDK_TOOLS_PATH=`pwd`/../BaseTools
# This version is for the tools source in edk2
@@ -29,5 +30,5 @@ index eb5eb73..9058fca 100755
source edksetup.sh BaseTools
else
--
-2.8.1
+2.17.1
diff --git a/meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch b/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch
similarity index 75%
rename from meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch
rename to meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch
index 070b0ac5a61..f37ed018abd 100644
--- a/meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch
+++ b/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch
@@ -1,25 +1,26 @@
-From 2320650c6d381b914fe91b2dedaa5870279a8bcf Mon Sep 17 00:00:00 2001
+From a8bceaec1b16fffbf6810df05503d8ae9092b735 Mon Sep 17 00:00:00 2001
From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
Date: Fri, 26 Jul 2019 17:34:26 -0400
-Subject: [PATCH] BaseTools: makefile: adjust to build in under bitbake
+Subject: [PATCH 2/5] BaseTools: makefile: adjust to build in under bitbake
Prepend the build flags with those of bitbake. This is to build
using the bitbake native sysroot include and library directories.
Signed-off-by: Ricardo Neri <ricardo.neri@linux.intel.com>
Upstream-Status: Pending
+
---
BaseTools/Source/C/Makefiles/header.makefile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
-Index: git/BaseTools/Source/C/Makefiles/header.makefile
-===================================================================
---- git.orig/BaseTools/Source/C/Makefiles/header.makefile
-+++ git/BaseTools/Source/C/Makefiles/header.makefile
+diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
+index 4e9b36d98b..eb03ee33fa 100644
+--- a/BaseTools/Source/C/Makefiles/header.makefile
++++ b/BaseTools/Source/C/Makefiles/header.makefile
@@ -62,23 +62,23 @@ $(error Bad HOST_ARCH)
endif
- INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE)
+ INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE)
-BUILD_CPPFLAGS = $(INCLUDE)
+BUILD_CPPFLAGS += $(INCLUDE)
@@ -46,5 +47,5 @@ Index: git/BaseTools/Source/C/Makefiles/header.makefile
ifeq ($(HOST_ARCH), IA32)
#
--
-2.20.1
+2.17.1
diff --git a/meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path-file.patch b/meta/recipes-core/ovmf/ovmf/0003-ovmf-enable-long-path-file.patch
similarity index 54%
rename from meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path-file.patch
rename to meta/recipes-core/ovmf/ovmf/0003-ovmf-enable-long-path-file.patch
index d954fbe3140..ab1e7db31f5 100644
--- a/meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path-file.patch
+++ b/meta/recipes-core/ovmf/ovmf/0003-ovmf-enable-long-path-file.patch
@@ -1,18 +1,28 @@
-From 032fc6b1f7691bd537fd2a6bd13821fcf3c45e64 Mon Sep 17 00:00:00 2001
+From 60a5f953f747e1e9e05a40157b651cba8ea57b91 Mon Sep 17 00:00:00 2001
From: Dengke Du <dengke.du@windriver.com>
Date: Mon, 11 Sep 2017 02:21:55 -0400
-Subject: [PATCH] ovmf: enable long path file
+Subject: [PATCH 3/5] ovmf: enable long path file
Upstream-Status: Pending
Signed-off-by: Dengke Du <dengke.du@windriver.com>
+
---
BaseTools/Source/C/Common/CommonLib.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/BaseTools/Source/C/Common/CommonLib.h b/BaseTools/Source/C/Common/CommonLib.h
-index 2041b89e2d..8116aa2e35 100644
+index e1cce985f7..d67d03c70c 100644
--- a/BaseTools/Source/C/Common/CommonLib.h
+++ b/BaseTools/Source/C/Common/CommonLib.h
-@@ -22 +22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@@ -14,7 +14,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
+ #include <assert.h>
+ #define PRINTED_GUID_BUFFER_SIZE 37 // including null-termination
+
-#define MAX_LONG_FILE_PATH 500
+#define MAX_LONG_FILE_PATH 1023
+
+ #define MAX_UINT64 ((UINT64)0xFFFFFFFFFFFFFFFFULL)
+ #define MAX_UINT32 ((UINT32)0xFFFFFFFF)
+--
+2.17.1
+
diff --git a/meta/recipes-core/ovmf/ovmf/no-stack-protector-all-archs.patch b/meta/recipes-core/ovmf/ovmf/0004-ovmf-Update-to-latest.patch
similarity index 82%
rename from meta/recipes-core/ovmf/ovmf/no-stack-protector-all-archs.patch
rename to meta/recipes-core/ovmf/ovmf/0004-ovmf-Update-to-latest.patch
index 1b65348e844..c10a39d95d4 100644
--- a/meta/recipes-core/ovmf/ovmf/no-stack-protector-all-archs.patch
+++ b/meta/recipes-core/ovmf/ovmf/0004-ovmf-Update-to-latest.patch
@@ -1,15 +1,24 @@
-Author: Steve Langasek <steve.langasek@ubuntu.com>
+From 94eff316b31b4d0348af28c77be5c00bc09fe8e7 Mon Sep 17 00:00:00 2001
+From: Steve Langasek <steve.langasek@ubuntu.com>
+Date: Sat, 10 Jun 2017 01:39:36 -0700
+Subject: [PATCH 4/5] ovmf: Update to latest
+
Description: pass -fno-stack-protector to all GCC toolchains
The upstream build rules inexplicably pass -fno-stack-protector only
when building for i386 and amd64. Add this essential argument to the
generic rules for gcc 4.4 and later.
Last-Updated: 2016-04-12
Upstream-Status: Pending
-Index: git/BaseTools/Conf/tools_def.template
-===================================================================
---- git.orig/BaseTools/Conf/tools_def.template
-+++ git/BaseTools/Conf/tools_def.template
-@@ -1736,10 +1736,10 @@ DEFINE GCC_X64_RC_FLAGS = -I binary -O elf64-x86-64 -B i386
+
+---
+ BaseTools/Conf/tools_def.template | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
+index ca0b122dbb..b0066c2ab8 100755
+--- a/BaseTools/Conf/tools_def.template
++++ b/BaseTools/Conf/tools_def.template
+@@ -1941,10 +1941,10 @@ DEFINE GCC_X64_RC_FLAGS = -I binary -O elf64-x86-64 -B i386
DEFINE GCC_ARM_RC_FLAGS = -I binary -O elf32-littlearm -B arm --rename-section .data=.hii
DEFINE GCC_AARCH64_RC_FLAGS = -I binary -O elf64-littleaarch64 -B aarch64 --rename-section .data=.hii
@@ -23,7 +32,7 @@ Index: git/BaseTools/Conf/tools_def.template
DEFINE GCC48_IA32_X64_ASLDLINK_FLAGS = DEF(GCC48_IA32_X64_DLINK_COMMON) -Wl,--entry,ReferenceAcpiTable -u ReferenceAcpiTable
DEFINE GCC48_IA32_X64_DLINK_FLAGS = DEF(GCC48_IA32_X64_DLINK_COMMON) -Wl,--entry,$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Wl,-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map,--whole-archive
DEFINE GCC48_IA32_DLINK2_FLAGS = -Wl,--defsym=PECOFF_HEADER_SIZE=0x220 DEF(GCC_DLINK2_FLAGS_COMMON)
-@@ -1748,7 +1748,7 @@ DEFINE GCC48_X64_DLINK2_FLAGS = -Wl,--defsym=PECOFF_HEADER_SIZE=0x228 DEF
+@@ -1953,7 +1953,7 @@ DEFINE GCC48_X64_DLINK2_FLAGS = -Wl,--defsym=PECOFF_HEADER_SIZE=0x228 DEF
DEFINE GCC48_ASM_FLAGS = DEF(GCC_ASM_FLAGS)
DEFINE GCC48_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian
DEFINE GCC48_AARCH64_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian
@@ -32,3 +41,6 @@ Index: git/BaseTools/Conf/tools_def.template
DEFINE GCC48_ARM_CC_XIPFLAGS = DEF(GCC_ARM_CC_XIPFLAGS)
DEFINE GCC48_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mcmodel=large DEF(GCC_AARCH64_CC_FLAGS)
DEFINE GCC48_AARCH64_CC_XIPFLAGS = DEF(GCC_AARCH64_CC_XIPFLAGS)
+--
+2.17.1
+
diff --git a/meta/recipes-core/ovmf/ovmf/VfrCompile-increase-path-length-limit.patch b/meta/recipes-core/ovmf/ovmf/VfrCompile-increase-path-length-limit.patch
deleted file mode 100644
index bb12d8beba6..00000000000
--- a/meta/recipes-core/ovmf/ovmf/VfrCompile-increase-path-length-limit.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c7722d10c7bcf6be0adcf54abb1d406599dd7914 Mon Sep 17 00:00:00 2001
-From: Patrick Ohly <patrick.ohly@intel.com>
-Date: Fri, 24 Feb 2017 01:40:02 +0100
-Subject: [PATCH] VfrCompile: increase path length limit
-
-The VfrCompile tool has a hard-coded maximum length for path names
-which turned out to be too small by around 20 characters in the Yocto
-autobuilder setup. Increasing the maximum by a factor of 4 is
-relatively easy and makes the problem less likely.
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
----
- BaseTools/Source/C/VfrCompile/EfiVfr.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/BaseTools/Source/C/VfrCompile/EfiVfr.h b/BaseTools/Source/C/VfrCompile/EfiVfr.h
-index d187902..9ad4a7b 100644
---- a/BaseTools/Source/C/VfrCompile/EfiVfr.h
-+++ b/BaseTools/Source/C/VfrCompile/EfiVfr.h
-@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
- #include "Common/UefiInternalFormRepresentation.h"
- #include "Common/MdeModuleHii.h"
-
--#define MAX_PATH 255
-+#define MAX_PATH 1023
- #define MAX_VFR_LINE_LEN 4096
-
- #define EFI_IFR_MAX_LENGTH 0xFF
---
-2.1.4
-
diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb
index ff2b2a530ad..9667fa0c862 100644
--- a/meta/recipes-core/ovmf/ovmf_git.bb
+++ b/meta/recipes-core/ovmf/ovmf_git.bb
@@ -13,14 +13,14 @@ PACKAGECONFIG ??= ""
PACKAGECONFIG[secureboot] = ",,,"
SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=git \
- file://0002-ovmf-update-path-to-native-BaseTools.patch \
- file://0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \
- file://0004-ovmf-enable-long-path-file.patch \
- file://no-stack-protector-all-archs.patch \
+ file://0001-ovmf-update-path-to-native-BaseTools.patch \
+ file://0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \
+ file://0003-ovmf-enable-long-path-file.patch \
+ file://0004-ovmf-Update-to-latest.patch \
"
-PV = "edk2-stable201905"
-SRCREV="20d2e5a125e34fc8501026613a71549b2a1a3e54"
+PV = "edk2-stable201911"
+SRCREV = "bd85bf54c268204c7a698a96f3ccd96cd77952cd"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)"
inherit deploy
--
2.17.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 04/16] meson: update 0.52.0 -> 0.52.1
2019-12-19 13:22 [PATCH 01/16] resolvconf: update to 1.80 Alexander Kanavin
2019-12-19 13:22 ` [PATCH 02/16] ifupdown: update 0.8.22 -> 0.8.35 Alexander Kanavin
2019-12-19 13:22 ` [PATCH 03/16] ovmf: update to 201911 Alexander Kanavin
@ 2019-12-19 13:22 ` Alexander Kanavin
2019-12-19 13:22 ` [PATCH 05/16] vala: upgrade 0.46.4 -> 0.46.5 Alexander Kanavin
` (12 subsequent siblings)
15 siblings, 0 replies; 23+ messages in thread
From: Alexander Kanavin @ 2019-12-19 13:22 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-devtools/meson/meson.inc | 5 +-
.../0001-Make-CPU-family-warnings-fatal.patch | 10 +-
...pport-building-allarch-recipes-again.patch | 4 +-
.../meson/meson/0003-native_bindir.patch | 26 ++---
...e971bd320f3df15c1ee74f54858e6792b183.patch | 95 -------------------
.../{meson_0.52.0.bb => meson_0.52.1.bb} | 1 +
...on_0.52.0.bb => nativesdk-meson_0.52.1.bb} | 0
7 files changed, 23 insertions(+), 118 deletions(-)
delete mode 100644 meta/recipes-devtools/meson/meson/dbc9e971bd320f3df15c1ee74f54858e6792b183.patch
rename meta/recipes-devtools/meson/{meson_0.52.0.bb => meson_0.52.1.bb} (97%)
rename meta/recipes-devtools/meson/{nativesdk-meson_0.52.0.bb => nativesdk-meson_0.52.1.bb} (100%)
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index 84bcc8409de..881a14c7f0a 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -16,10 +16,9 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
file://cross-prop-default.patch \
file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
- file://dbc9e971bd320f3df15c1ee74f54858e6792b183.patch \
"
-SRC_URI[sha256sum] = "d60f75f0dedcc4fd249dbc7519d6f3ce6df490033d276ef1cf27453ef4938d32"
-SRC_URI[md5sum] = "7ea7772414dda8ae11072244bf7ba991"
+SRC_URI[sha256sum] = "0c277472e49950a5537e3de3e60c57b80dbf425788470a1a8ed27446128fc035"
+SRC_URI[md5sum] = "a5f0c99567d772508f649a28ded7f8ad"
SRC_URI_append_class-native = " \
file://0001-Make-CPU-family-warnings-fatal.patch \
diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
index fc55dcacf6d..d4264cee526 100644
--- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
+++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
@@ -1,4 +1,4 @@
-From c07d29b715209cd5d75b142a00a540d45b00c36d Mon Sep 17 00:00:00 2001
+From cd980c763f11cfd928255346cc7e86f24add985e Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Tue, 3 Jul 2018 13:59:09 +0100
Subject: [PATCH] Make CPU family warnings fatal
@@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index a59cd89..17de654 100644
+index 29d7422..5fb00a4 100644
--- a/mesonbuild/envconfig.py
+++ b/mesonbuild/envconfig.py
-@@ -186,7 +186,7 @@ class MachineInfo:
+@@ -190,7 +190,7 @@ class MachineInfo:
cpu_family = literal['cpu_family']
if cpu_family not in known_cpu_families:
@@ -25,10 +25,10 @@ index a59cd89..17de654 100644
endian = literal['endian']
if endian not in ('little', 'big'):
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 3704921..f1988f2 100644
+index a9bc2b8..b91c8da 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
-@@ -251,9 +251,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
+@@ -348,9 +348,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
trial = 'parisc'
if trial not in known_cpu_families:
diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
index b8837d77b64..c8c7b298de3 100644
--- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
+++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
@@ -1,4 +1,4 @@
-From 263fc0e26e1fd92e25fa3ef93f4a549dcebc5887 Mon Sep 17 00:00:00 2001
+From 4d223562c3e510e0dd62b608d184604e2cab6198 Mon Sep 17 00:00:00 2001
From: Peter Kjellerstedt <pkj@axis.com>
Date: Thu, 26 Jul 2018 16:32:49 +0200
Subject: [PATCH] Support building allarch recipes again
@@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
1 file changed, 1 insertion(+)
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 17de654..2d2deef 100644
+index 5fb00a4..f5702ba 100644
--- a/mesonbuild/envconfig.py
+++ b/mesonbuild/envconfig.py
@@ -36,6 +36,7 @@ _T = typing.TypeVar('_T')
diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
index 76cc4931d63..14a9a136664 100644
--- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
+++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
@@ -1,4 +1,4 @@
-From 4a1d676522d6b56cbe9a45c3b040afaa27d37f78 Mon Sep 17 00:00:00 2001
+From baf7b94fec5a31b2d0cb162e43dbd28cc019f38e Mon Sep 17 00:00:00 2001
From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Date: Wed, 15 Nov 2017 15:05:01 +0100
Subject: [PATCH] native_bindir
@@ -22,10 +22,10 @@ Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
-index 3c55a56..eb52fd1 100644
+index 35f0175..b39cba6 100644
--- a/mesonbuild/dependencies/base.py
+++ b/mesonbuild/dependencies/base.py
-@@ -185,7 +185,7 @@ class Dependency:
+@@ -184,7 +184,7 @@ class Dependency:
def get_exe_args(self, compiler):
return []
@@ -34,7 +34,7 @@ index 3c55a56..eb52fd1 100644
raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name))
def get_configtool_variable(self, variable_name):
-@@ -248,7 +248,7 @@ class InternalDependency(Dependency):
+@@ -247,7 +247,7 @@ class InternalDependency(Dependency):
self.sources = sources
self.ext_deps = ext_deps
@@ -54,11 +54,11 @@ index 3c55a56..eb52fd1 100644
+ cmd = [self.pkgbin.get_command()[0] + "-native"] + args
+ else:
+ cmd = self.pkgbin.get_command() + args
- p, out = Popen_safe(cmd, env=env)[0:2]
- rc, out = p.returncode, out.strip()
+ p, out, err = Popen_safe(cmd, env=env)
+ rc, out, err = p.returncode, out.strip(), err.strip()
call = ' '.join(cmd)
mlog.debug("Called `{}` -> {}\n{}".format(call, rc, out))
- return rc, out
+ return rc, out, err
- def _call_pkgbin(self, args, env=None):
+ def _call_pkgbin(self, args, env=None, use_native=False):
@@ -74,21 +74,21 @@ index 3c55a56..eb52fd1 100644
return cache[(self.pkgbin, targs, fenv)]
def _convert_mingw_paths(self, args):
-@@ -926,7 +929,7 @@ class PkgConfigDependency(ExternalDependency):
- mlog.warning('Could not determine complete list of dependencies for %s' % self.name)
- self.link_args, self.raw_link_args = self._search_libs(out, out_raw, out_all)
+@@ -885,7 +888,7 @@ class PkgConfigDependency(ExternalDependency):
+ (self.name, out_raw))
+ self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
- def get_pkgconfig_variable(self, variable_name, kwargs):
+ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False):
options = ['--variable=' + variable_name, self.name]
if 'define_variable' in kwargs:
-@@ -939,7 +942,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -898,7 +901,7 @@ class PkgConfigDependency(ExternalDependency):
options = ['--define-variable=' + '='.join(definition)] + options
-- ret, out = self._call_pkgbin(options)
-+ ret, out = self._call_pkgbin(options, use_native=use_native)
+- ret, out, err = self._call_pkgbin(options)
++ ret, out, err = self._call_pkgbin(options, use_native=use_native)
variable = ''
if ret != 0:
if self.required:
diff --git a/meta/recipes-devtools/meson/meson/dbc9e971bd320f3df15c1ee74f54858e6792b183.patch b/meta/recipes-devtools/meson/meson/dbc9e971bd320f3df15c1ee74f54858e6792b183.patch
deleted file mode 100644
index 7ea8a133e6a..00000000000
--- a/meta/recipes-devtools/meson/meson/dbc9e971bd320f3df15c1ee74f54858e6792b183.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From dbc9e971bd320f3df15c1ee74f54858e6792b183 Mon Sep 17 00:00:00 2001
-From: Xavier Claessens <xavier.claessens@collabora.com>
-Date: Fri, 11 Oct 2019 11:01:22 -0400
-Subject: [PATCH] Remove duplicated object files in static libraries
-
-When a static library link_whole to a bunch of other static libraries,
-we have to extract all their objects recursively. But that could
-introduce duplicated objects. ar is dumb enough to allow this without
-error, but once the resulting static library is linked into an
-executable or shared library, the linker will complain about duplicated
-symbols.
-
-Upstream-Status: Backport
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-
----
- mesonbuild/backend/backends.py | 3 ++-
- test cases/unit/69 static link/lib/func17.c | 4 ++++
- test cases/unit/69 static link/lib/func18.c | 6 ++++++
- test cases/unit/69 static link/lib/func19.c | 7 +++++++
- test cases/unit/69 static link/lib/meson.build | 12 ++++++++++++
- 5 files changed, 31 insertions(+), 1 deletion(-)
- create mode 100644 test cases/unit/69 static link/lib/func17.c
- create mode 100644 test cases/unit/69 static link/lib/func18.c
- create mode 100644 test cases/unit/69 static link/lib/func19.c
-
-diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
-index 947be1cbef..e54809657f 100644
---- a/mesonbuild/backend/backends.py
-+++ b/mesonbuild/backend/backends.py
-@@ -281,7 +281,8 @@ def relpath(self, todir, fromdir):
- os.path.join('dummyprefixdir', fromdir))
-
- def flatten_object_list(self, target, proj_dir_to_build_root=''):
-- return self._flatten_object_list(target, target.get_objects(), proj_dir_to_build_root)
-+ obj_list = self._flatten_object_list(target, target.get_objects(), proj_dir_to_build_root)
-+ return list(dict.fromkeys(obj_list))
-
- def _flatten_object_list(self, target, objects, proj_dir_to_build_root):
- obj_list = []
-diff --git a/test cases/unit/69 static link/lib/func17.c b/test cases/unit/69 static link/lib/func17.c
-new file mode 100644
-index 0000000000..d1d8ec498c
---- /dev/null
-+++ b/test cases/unit/69 static link/lib/func17.c
-@@ -0,0 +1,4 @@
-+int func17()
-+{
-+ return 1;
-+}
-diff --git a/test cases/unit/69 static link/lib/func18.c b/test cases/unit/69 static link/lib/func18.c
-new file mode 100644
-index 0000000000..c149085ba4
---- /dev/null
-+++ b/test cases/unit/69 static link/lib/func18.c
-@@ -0,0 +1,6 @@
-+int func17();
-+
-+int func18()
-+{
-+ return func17() + 1;
-+}
-diff --git a/test cases/unit/69 static link/lib/func19.c b/test cases/unit/69 static link/lib/func19.c
-new file mode 100644
-index 0000000000..69120e4bf8
---- /dev/null
-+++ b/test cases/unit/69 static link/lib/func19.c
-@@ -0,0 +1,7 @@
-+int func17();
-+int func18();
-+
-+int func19()
-+{
-+ return func17() + func18();
-+}
-diff --git a/test cases/unit/69 static link/lib/meson.build b/test cases/unit/69 static link/lib/meson.build
-index 5f04aab6a1..8f95fc4546 100644
---- a/test cases/unit/69 static link/lib/meson.build
-+++ b/test cases/unit/69 static link/lib/meson.build
-@@ -66,3 +66,15 @@ libfunc15 = static_library('func15', 'func15.c',
- libfunc16 = static_library('func16', 'func16.c',
- link_with : libfunc15,
- install : true)
-+
-+# Verify func17.c.o gets included only once into libfunc19, otherwise
-+# func19-shared would failed with duplicated symbol.
-+libfunc17 = static_library('func17', 'func17.c',
-+ install : false)
-+libfunc18 = static_library('func18', 'func18.c',
-+ link_with : libfunc17,
-+ install : false)
-+libfunc19 = static_library('func19', 'func19.c',
-+ link_whole : [libfunc17, libfunc18],
-+ install : false)
-+shared_library('func19-shared', link_whole : [libfunc19])
diff --git a/meta/recipes-devtools/meson/meson_0.52.0.bb b/meta/recipes-devtools/meson/meson_0.52.1.bb
similarity index 97%
rename from meta/recipes-devtools/meson/meson_0.52.0.bb
rename to meta/recipes-devtools/meson/meson_0.52.1.bb
index 897fa148d94..de9b905c12b 100644
--- a/meta/recipes-devtools/meson/meson_0.52.0.bb
+++ b/meta/recipes-devtools/meson/meson_0.52.1.bb
@@ -1,3 +1,4 @@
include meson.inc
BBCLASSEXTEND = "native"
+
diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.52.0.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.52.0.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb
--
2.17.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 05/16] vala: upgrade 0.46.4 -> 0.46.5
2019-12-19 13:22 [PATCH 01/16] resolvconf: update to 1.80 Alexander Kanavin
` (2 preceding siblings ...)
2019-12-19 13:22 ` [PATCH 04/16] meson: update 0.52.0 -> 0.52.1 Alexander Kanavin
@ 2019-12-19 13:22 ` Alexander Kanavin
2019-12-19 13:22 ` [PATCH 06/16] bash-completion: upgrade 2.9 -> 2.10 Alexander Kanavin
` (11 subsequent siblings)
15 siblings, 0 replies; 23+ messages in thread
From: Alexander Kanavin @ 2019-12-19 13:22 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-devtools/vala/{vala_0.46.4.bb => vala_0.46.5.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/vala/{vala_0.46.4.bb => vala_0.46.5.bb} (57%)
diff --git a/meta/recipes-devtools/vala/vala_0.46.4.bb b/meta/recipes-devtools/vala/vala_0.46.5.bb
similarity index 57%
rename from meta/recipes-devtools/vala/vala_0.46.4.bb
rename to meta/recipes-devtools/vala/vala_0.46.5.bb
index c4cd6dd4109..9233d109dd9 100644
--- a/meta/recipes-devtools/vala/vala_0.46.4.bb
+++ b/meta/recipes-devtools/vala/vala_0.46.5.bb
@@ -4,5 +4,5 @@ SRC_URI += "file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.pat
file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \
"
-SRC_URI[md5sum] = "b79bbaf8929ec8ed35911b3571f5a248"
-SRC_URI[sha256sum] = "4bb9b60fc0230b0db2c8a0e2a80ec29f1c10b43dc78355abba78adedbc2e03a1"
+SRC_URI[md5sum] = "a0a2eb8babb72c1b4e81c4f1b98429df"
+SRC_URI[sha256sum] = "1a7847d2599d902c805a58b95b72b69e64c0223c2f6220163998a7ab4b42db1d"
--
2.17.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 06/16] bash-completion: upgrade 2.9 -> 2.10
2019-12-19 13:22 [PATCH 01/16] resolvconf: update to 1.80 Alexander Kanavin
` (3 preceding siblings ...)
2019-12-19 13:22 ` [PATCH 05/16] vala: upgrade 0.46.4 -> 0.46.5 Alexander Kanavin
@ 2019-12-19 13:22 ` Alexander Kanavin
2019-12-19 13:22 ` [PATCH 07/16] libcomps: upgrade 0.1.12 -> 0.1.14 Alexander Kanavin
` (10 subsequent siblings)
15 siblings, 0 replies; 23+ messages in thread
From: Alexander Kanavin @ 2019-12-19 13:22 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../{bash-completion_2.9.bb => bash-completion_2.10.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/bash-completion/{bash-completion_2.9.bb => bash-completion_2.10.bb} (87%)
diff --git a/meta/recipes-support/bash-completion/bash-completion_2.9.bb b/meta/recipes-support/bash-completion/bash-completion_2.10.bb
similarity index 87%
rename from meta/recipes-support/bash-completion/bash-completion_2.9.bb
rename to meta/recipes-support/bash-completion/bash-completion_2.10.bb
index cd2c4cbba80..041af7490ec 100644
--- a/meta/recipes-support/bash-completion/bash-completion_2.9.bb
+++ b/meta/recipes-support/bash-completion/bash-completion_2.10.bb
@@ -9,8 +9,8 @@ SECTION = "console/utils"
SRC_URI = "https://github.com/scop/bash-completion/releases/download/${PV}/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "60139333b25c4d54ad40323b701be130"
-SRC_URI[sha256sum] = "d48fe378e731062f479c5f8802ffa9d3c40a275a19e6e0f6f6cc4b90fa12b2f5"
+SRC_URI[md5sum] = "f376ae3266cc70017aa833c39b76f984"
+SRC_URI[sha256sum] = "123c17998e34b937ce57bb1b111cd817bc369309e9a8047c0bcf06ead4a3ec92"
UPSTREAM_CHECK_REGEX = "bash-completion-(?P<pver>(?!2008).+)\.tar"
UPSTREAM_CHECK_URI = "https://github.com/scop/bash-completion/releases"
--
2.17.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 07/16] libcomps: upgrade 0.1.12 -> 0.1.14
2019-12-19 13:22 [PATCH 01/16] resolvconf: update to 1.80 Alexander Kanavin
` (4 preceding siblings ...)
2019-12-19 13:22 ` [PATCH 06/16] bash-completion: upgrade 2.9 -> 2.10 Alexander Kanavin
@ 2019-12-19 13:22 ` Alexander Kanavin
2019-12-19 13:22 ` [PATCH 08/16] createrepo-c: upgrade 0.15.1 -> 0.15.4 Alexander Kanavin
` (9 subsequent siblings)
15 siblings, 0 replies; 23+ messages in thread
From: Alexander Kanavin @ 2019-12-19 13:22 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-devtools/libcomps/libcomps_git.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/libcomps/libcomps_git.bb b/meta/recipes-devtools/libcomps/libcomps_git.bb
index 34881bba372..40b60159bcd 100644
--- a/meta/recipes-devtools/libcomps/libcomps_git.bb
+++ b/meta/recipes-devtools/libcomps/libcomps_git.bb
@@ -8,8 +8,8 @@ SRC_URI = "git://github.com/rpm-software-management/libcomps.git \
file://0001-Add-crc32.c-to-sources-list.patch \
"
-PV = "0.1.12"
-SRCREV = "d0c8aa312dcab75c265ed6123f8afe0d7c8e91db"
+PV = "0.1.14"
+SRCREV = "5a0e04286f3462e3308f2a332eb0f90a66920218"
S = "${WORKDIR}/git"
--
2.17.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 08/16] createrepo-c: upgrade 0.15.1 -> 0.15.4
2019-12-19 13:22 [PATCH 01/16] resolvconf: update to 1.80 Alexander Kanavin
` (5 preceding siblings ...)
2019-12-19 13:22 ` [PATCH 07/16] libcomps: upgrade 0.1.12 -> 0.1.14 Alexander Kanavin
@ 2019-12-19 13:22 ` Alexander Kanavin
2019-12-19 13:22 ` [PATCH 09/16] librepo: upgrade 1.11.0 -> 1.11.1 Alexander Kanavin
` (8 subsequent siblings)
15 siblings, 0 replies; 23+ messages in thread
From: Alexander Kanavin @ 2019-12-19 13:22 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../{createrepo-c_0.15.1.bb => createrepo-c_0.15.4.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/createrepo-c/{createrepo-c_0.15.1.bb => createrepo-c_0.15.4.bb} (95%)
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.1.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.4.bb
similarity index 95%
rename from meta/recipes-devtools/createrepo-c/createrepo-c_0.15.1.bb
rename to meta/recipes-devtools/createrepo-c/createrepo-c_0.15.4.bb
index 797db738f47..75762b7fa52 100644
--- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.1.bb
+++ b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.4.bb
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c \
file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
"
-SRCREV = "bc67f19ed09593e3886ebeee2391e9d51cc3439f"
+SRCREV = "8ac472e1267b2ca11d11418099ab923d319fa2dc"
S = "${WORKDIR}/git"
--
2.17.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 09/16] librepo: upgrade 1.11.0 -> 1.11.1
2019-12-19 13:22 [PATCH 01/16] resolvconf: update to 1.80 Alexander Kanavin
` (6 preceding siblings ...)
2019-12-19 13:22 ` [PATCH 08/16] createrepo-c: upgrade 0.15.1 -> 0.15.4 Alexander Kanavin
@ 2019-12-19 13:22 ` Alexander Kanavin
2019-12-19 13:22 ` [PATCH 10/16] btrfs-tools: upgrade 5.3.1 -> 5.4 Alexander Kanavin
` (7 subsequent siblings)
15 siblings, 0 replies; 23+ messages in thread
From: Alexander Kanavin @ 2019-12-19 13:22 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../librepo/{librepo_1.11.0.bb => librepo_1.11.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/librepo/{librepo_1.11.0.bb => librepo_1.11.1.bb} (93%)
diff --git a/meta/recipes-devtools/librepo/librepo_1.11.0.bb b/meta/recipes-devtools/librepo/librepo_1.11.1.bb
similarity index 93%
rename from meta/recipes-devtools/librepo/librepo_1.11.0.bb
rename to meta/recipes-devtools/librepo/librepo_1.11.1.bb
index 30c8a5c55d5..dbf1016456e 100644
--- a/meta/recipes-devtools/librepo/librepo_1.11.0.bb
+++ b/meta/recipes-devtools/librepo/librepo_1.11.1.bb
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/librepo.git \
file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \
"
-SRCREV = "497f5eb2293662835bed6bdb0f43521788b2cebe"
+SRCREV = "5ade10012d40fad27a7aa1085091c2c5fdd099ff"
S = "${WORKDIR}/git"
--
2.17.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 10/16] btrfs-tools: upgrade 5.3.1 -> 5.4
2019-12-19 13:22 [PATCH 01/16] resolvconf: update to 1.80 Alexander Kanavin
` (7 preceding siblings ...)
2019-12-19 13:22 ` [PATCH 09/16] librepo: upgrade 1.11.0 -> 1.11.1 Alexander Kanavin
@ 2019-12-19 13:22 ` Alexander Kanavin
2019-12-19 13:22 ` [PATCH 11/16] epiphany: upgrade 3.34.1 -> 3.34.2 Alexander Kanavin
` (6 subsequent siblings)
15 siblings, 0 replies; 23+ messages in thread
From: Alexander Kanavin @ 2019-12-19 13:22 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../btrfs-tools/{btrfs-tools_5.3.1.bb => btrfs-tools_5.4.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_5.3.1.bb => btrfs-tools_5.4.bb} (97%)
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.3.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.4.bb
similarity index 97%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.3.1.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_5.4.bb
index a44c0bc87af..86d88fbcbe5 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.3.1.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.4.bb
@@ -14,7 +14,7 @@ DEPENDS = "util-linux attr e2fsprogs lzo acl"
DEPENDS_append_class-target = " udev"
RDEPENDS_${PN} = "libgcc"
-SRCREV = "f82e569b33c3c1cfd4f8f405085ff8d439a0a915"
+SRCREV = "d39ab9fafeb425d28fcaac645f7d663555fa654d"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
"
--
2.17.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 11/16] epiphany: upgrade 3.34.1 -> 3.34.2
2019-12-19 13:22 [PATCH 01/16] resolvconf: update to 1.80 Alexander Kanavin
` (8 preceding siblings ...)
2019-12-19 13:22 ` [PATCH 10/16] btrfs-tools: upgrade 5.3.1 -> 5.4 Alexander Kanavin
@ 2019-12-19 13:22 ` Alexander Kanavin
2019-12-19 13:22 ` [PATCH 12/16] boost: upgrade 1.71.0 -> 1.72.0 Alexander Kanavin
` (5 subsequent siblings)
15 siblings, 0 replies; 23+ messages in thread
From: Alexander Kanavin @ 2019-12-19 13:22 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../epiphany/{epiphany_3.34.1.bb => epiphany_3.34.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/epiphany/{epiphany_3.34.1.bb => epiphany_3.34.2.bb} (84%)
diff --git a/meta/recipes-gnome/epiphany/epiphany_3.34.1.bb b/meta/recipes-gnome/epiphany/epiphany_3.34.2.bb
similarity index 84%
rename from meta/recipes-gnome/epiphany/epiphany_3.34.1.bb
rename to meta/recipes-gnome/epiphany/epiphany_3.34.2.bb
index cebd55dc879..a196a217dcc 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.34.1.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.34.2.bb
@@ -14,8 +14,8 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl"
SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
file://0002-help-meson.build-disable-the-use-of-yelp.patch \
"
-SRC_URI[archive.md5sum] = "50b50e18d99b19f44cc9cd419c6a4ba8"
-SRC_URI[archive.sha256sum] = "a07bc997ad2cbf14d58557bb0b63e92d8c33683680c5e50ea6f9b53b36bec1d9"
+SRC_URI[archive.md5sum] = "ae404e3a70ff904f5a23466727f8a90a"
+SRC_URI[archive.sha256sum] = "0eaa36fc7b73a23121a23b8a7ad3c18edaf5a8a6b7cdd6d630ba5b71d946a4a1"
FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo"
RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas"
--
2.17.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 12/16] boost: upgrade 1.71.0 -> 1.72.0
2019-12-19 13:22 [PATCH 01/16] resolvconf: update to 1.80 Alexander Kanavin
` (9 preceding siblings ...)
2019-12-19 13:22 ` [PATCH 11/16] epiphany: upgrade 3.34.1 -> 3.34.2 Alexander Kanavin
@ 2019-12-19 13:22 ` Alexander Kanavin
2019-12-19 13:22 ` [PATCH 13/16] strace: update to 5.4 Alexander Kanavin
` (4 subsequent siblings)
15 siblings, 0 replies; 23+ messages in thread
From: Alexander Kanavin @ 2019-12-19 13:22 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../boost/{bjam-native_1.71.0.bb => bjam-native_1.72.0.bb} | 0
.../boost/{boost-1.71.0.inc => boost-1.72.0.inc} | 4 ++--
.../boost/{boost_1.71.0.bb => boost_1.72.0.bb} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/boost/{bjam-native_1.71.0.bb => bjam-native_1.72.0.bb} (100%)
rename meta/recipes-support/boost/{boost-1.71.0.inc => boost-1.72.0.inc} (85%)
rename meta/recipes-support/boost/{boost_1.71.0.bb => boost_1.72.0.bb} (100%)
diff --git a/meta/recipes-support/boost/bjam-native_1.71.0.bb b/meta/recipes-support/boost/bjam-native_1.72.0.bb
similarity index 100%
rename from meta/recipes-support/boost/bjam-native_1.71.0.bb
rename to meta/recipes-support/boost/bjam-native_1.72.0.bb
diff --git a/meta/recipes-support/boost/boost-1.71.0.inc b/meta/recipes-support/boost/boost-1.72.0.inc
similarity index 85%
rename from meta/recipes-support/boost/boost-1.71.0.inc
rename to meta/recipes-support/boost/boost-1.72.0.inc
index 7164d0f1c57..55a095bf1c3 100644
--- a/meta/recipes-support/boost/boost-1.71.0.inc
+++ b/meta/recipes-support/boost/boost-1.72.0.inc
@@ -12,8 +12,8 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}"
BOOST_P = "boost_${BOOST_VER}"
SRC_URI = "https://dl.bintray.com/boostorg/release/${PV}/source/${BOOST_P}.tar.bz2"
-SRC_URI[md5sum] = "4cdf9b5c2dc01fb2b7b733d5af30e558"
-SRC_URI[sha256sum] = "d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee"
+SRC_URI[md5sum] = "cb40943d2a2cb8ce08d42bc48b0f84f0"
+SRC_URI[sha256sum] = "59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722"
UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/"
UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/"
diff --git a/meta/recipes-support/boost/boost_1.71.0.bb b/meta/recipes-support/boost/boost_1.72.0.bb
similarity index 100%
rename from meta/recipes-support/boost/boost_1.71.0.bb
rename to meta/recipes-support/boost/boost_1.72.0.bb
--
2.17.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 13/16] strace: update to 5.4
2019-12-19 13:22 [PATCH 01/16] resolvconf: update to 1.80 Alexander Kanavin
` (10 preceding siblings ...)
2019-12-19 13:22 ` [PATCH 12/16] boost: upgrade 1.71.0 -> 1.72.0 Alexander Kanavin
@ 2019-12-19 13:22 ` Alexander Kanavin
2019-12-19 13:22 ` [PATCH 14/16] gnutls: update to 3.6.11.1 Alexander Kanavin
` (3 subsequent siblings)
15 siblings, 0 replies; 23+ messages in thread
From: Alexander Kanavin @ 2019-12-19 13:22 UTC (permalink / raw)
To: openembedded-core
Drop patch as issue fixed upstream.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...Check-for-mips-and-alpha-before-usin.patch | 32 -------------------
...st-test-for-m32-mx32-compile-support.patch | 12 +++----
.../strace/{strace_5.3.bb => strace_5.4.bb} | 5 ++-
3 files changed, 8 insertions(+), 41 deletions(-)
delete mode 100644 meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch
rename meta/recipes-devtools/strace/{strace_5.3.bb => strace_5.4.bb} (89%)
diff --git a/meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch b/meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch
deleted file mode 100644
index 95d85bf34ae..00000000000
--- a/meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 879ae71c472ce522f1b3514d2abf6ad49b4acc07 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 18 Sep 2017 22:51:32 -0700
-Subject: [PATCH] tests/sigaction: Check for mips and alpha before using
- sa_restorer
-
-local structure does not define restorer member for mips and alpha
-in definition, we need to match that assumption here where they are
-being set
-
-Fixes
-| ../../strace-4.18/tests/sigaction.c:177:36: error: 'struct_set_sa {aka struct set_sa}' has no member named 'restorer'
-| # define SA_RESTORER_ARGS , new_act->restorer
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- tests/sigaction.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/tests/sigaction.c
-+++ b/tests/sigaction.c
-@@ -156,7 +156,7 @@ main(void)
- sigdelset(mask.libc, SIGHUP);
-
- memcpy(new_act->mask, mask.old, sizeof(mask.old));
--# ifdef SA_RESTORER
-+#if defined(SA_RESTORER) && !defined(MIPS) && !defined(ALPHA)
- new_act->flags = SA_RESTORER;
- new_act->restorer = (unsigned long) 0xdeadfacecafef00dULL;
- # define SA_RESTORER_FMT ", sa_flags=SA_RESTORER, sa_restorer=%#lx"
diff --git a/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch b/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch
index a9bd900da86..11fca4f4a91 100644
--- a/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch
+++ b/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch
@@ -1,4 +1,4 @@
-From cc97307e8e39a81999c6a365d057487a02e6128e Mon Sep 17 00:00:00 2001
+From 1e19f38307d20d751c64b1f0376b29d8b2119a93 Mon Sep 17 00:00:00 2001
From: Andre McCurdy <armccurdy@gmail.com>
Date: Mon, 18 Jan 2016 11:00:00 -0800
Subject: [PATCH] mpers.m4: more robust test for -m32/-mx32 compile support
@@ -24,18 +24,18 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
1 file changed, 2 insertions(+)
diff --git a/m4/mpers.m4 b/m4/mpers.m4
-index 13725d7..d8578ea 100644
+index 92eeb1f..1921a04 100644
--- a/m4/mpers.m4
+++ b/m4/mpers.m4
-@@ -88,6 +88,7 @@ case "$arch" in
- CFLAGS="$CFLAGS MPERS_CFLAGS $IFLAG"
- AC_CACHE_CHECK([for mpers_name personality compile support], [st_cv_cc],
+@@ -103,6 +103,7 @@ case "$arch" in
+ CFLAGS="$CFLAGS MPERS_CFLAGS${IFLAG:+ }$IFLAG"
+ AC_CACHE_CHECK([for mpers_name personality compile support (using $CC $CFLAGS)], [st_cv_cc],
[AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <stdint.h>
+ #include <sys/syscall.h>
int main(){return 0;}]])],
[st_cv_cc=yes],
[st_cv_cc=no])])
-@@ -95,6 +96,7 @@ case "$arch" in
+@@ -110,6 +111,7 @@ case "$arch" in
AC_CACHE_CHECK([for mpers_name personality runtime support],
[st_cv_runtime],
[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdint.h>
diff --git a/meta/recipes-devtools/strace/strace_5.3.bb b/meta/recipes-devtools/strace/strace_5.4.bb
similarity index 89%
rename from meta/recipes-devtools/strace/strace_5.3.bb
rename to meta/recipes-devtools/strace/strace_5.4.bb
index b000afb30be..ed1b1cd9078 100644
--- a/meta/recipes-devtools/strace/strace_5.3.bb
+++ b/meta/recipes-devtools/strace/strace_5.4.bb
@@ -12,13 +12,12 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
file://run-ptest \
file://mips-SIGEMT.patch \
file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \
- file://0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch \
file://ptest-spacesave.patch \
file://uintptr_t.patch \
file://sys_headers.patch \
"
-SRC_URI[md5sum] = "84f5e72de813c9b1bb6057ee8ab428d8"
-SRC_URI[sha256sum] = "6c131198749656401fe3efd6b4b16a07ea867e8f530867ceae8930bbc937a047"
+SRC_URI[md5sum] = "b2b58f05eb3c5c0bf9d1e26003b4d698"
+SRC_URI[sha256sum] = "f7d00514d51290b6db78ad7a9de709baf93caa5981498924cbc9a744cfd2a741"
inherit autotools ptest
--
2.17.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 14/16] gnutls: update to 3.6.11.1
2019-12-19 13:22 [PATCH 01/16] resolvconf: update to 1.80 Alexander Kanavin
` (11 preceding siblings ...)
2019-12-19 13:22 ` [PATCH 13/16] strace: update to 5.4 Alexander Kanavin
@ 2019-12-19 13:22 ` Alexander Kanavin
2019-12-19 13:23 ` [PATCH 15/16] llvm: fix upstream version check Alexander Kanavin
` (2 subsequent siblings)
15 siblings, 0 replies; 23+ messages in thread
From: Alexander Kanavin @ 2019-12-19 13:22 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../gnutls/gnutls/posix-shell.patch | 14 ++++++++++++--
.../gnutls/{gnutls_3.6.8.bb => gnutls_3.6.11.1.bb} | 4 ++--
2 files changed, 14 insertions(+), 4 deletions(-)
rename meta/recipes-support/gnutls/{gnutls_3.6.8.bb => gnutls_3.6.11.1.bb} (94%)
diff --git a/meta/recipes-support/gnutls/gnutls/posix-shell.patch b/meta/recipes-support/gnutls/gnutls/posix-shell.patch
index 938e2d1e18f..eda1c6c300e 100644
--- a/meta/recipes-support/gnutls/gnutls/posix-shell.patch
+++ b/meta/recipes-support/gnutls/gnutls/posix-shell.patch
@@ -1,3 +1,8 @@
+From 0fce96e7d702d8f3bdbea57c1e77027446a91d37 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@intel.com>
+Date: Thu, 25 Jul 2019 16:20:23 +0100
+Subject: [PATCH] gnutls: don't use HOSTTOOLS_DIR/bash as a shell on target
+
Don't embed the path to the build-time POSIX shell as this will be
$TMPDIR/hosttools/bash, which is no good on the target.
@@ -10,16 +15,21 @@ integrated.
Upstream-Status: Inappropriate
Signed-off-by: Ross Burton <ross.burton@intel.com>
+---
+ src/libopts/m4/libopts.m4 | 17 +----------------
+ 1 file changed, 1 insertion(+), 16 deletions(-)
+
diff --git a/src/libopts/m4/libopts.m4 b/src/libopts/m4/libopts.m4
-index c6ad738..a62faca 100644
+index 23738ca..b47c0da 100644
--- a/src/libopts/m4/libopts.m4
+++ b/src/libopts/m4/libopts.m4
-@@ -112,21 +112,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[
+@@ -105,22 +105,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[
AC_CHECK_FUNCS([mmap canonicalize_file_name snprintf strdup strchr \
strrchr strsignal fchmod fstat chmod])
AC_PROG_SED
- [while :
- do
+- test -x "$POSIX_SHELL" && break
- POSIX_SHELL=`which bash`
- test -x "$POSIX_SHELL" && break
- POSIX_SHELL=`which dash`
diff --git a/meta/recipes-support/gnutls/gnutls_3.6.8.bb b/meta/recipes-support/gnutls/gnutls_3.6.11.1.bb
similarity index 94%
rename from meta/recipes-support/gnutls/gnutls_3.6.8.bb
rename to meta/recipes-support/gnutls/gnutls_3.6.11.1.bb
index c927063f0a3..14c858eaec2 100644
--- a/meta/recipes-support/gnutls/gnutls_3.6.8.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.6.11.1.bb
@@ -22,8 +22,8 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar
file://posix-shell.patch \
"
-SRC_URI[md5sum] = "9dcf0aa45d1a42e1b3ca5d39ec7c61a8"
-SRC_URI[sha256sum] = "aa81944e5635de981171772857e72be231a7e0f559ae0292d2737de475383e83"
+SRC_URI[md5sum] = "3670ee0b0d95b3dee185eff2dc910ee7"
+SRC_URI[sha256sum] = "fbba12f3db9a55dbf027e14111755817ec44b57eabec3e8089aac8ac6f533cf8"
inherit autotools texinfo pkgconfig gettext lib_package gtk-doc
--
2.17.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 15/16] llvm: fix upstream version check
2019-12-19 13:22 [PATCH 01/16] resolvconf: update to 1.80 Alexander Kanavin
` (12 preceding siblings ...)
2019-12-19 13:22 ` [PATCH 14/16] gnutls: update to 3.6.11.1 Alexander Kanavin
@ 2019-12-19 13:23 ` Alexander Kanavin
2019-12-19 13:23 ` [PATCH 16/16] python3-pygments: update to 2.5.2 Alexander Kanavin
2019-12-19 13:32 ` ✗ patchtest: failure for "resolvconf: update to 1.80..." and 15 more Patchwork
15 siblings, 0 replies; 23+ messages in thread
From: Alexander Kanavin @ 2019-12-19 13:23 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-devtools/llvm/llvm_git.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb
index cb2e1164cfb..3b0a1b3b276 100644
--- a/meta/recipes-devtools/llvm/llvm_git.bb
+++ b/meta/recipes-devtools/llvm/llvm_git.bb
@@ -35,6 +35,8 @@ SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH} \
file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \
"
+UPSTREAM_CHECK_GITTAGREGEX = "llvmorg-(?P<pver>\d+(\.\d+)+)"
+
S = "${WORKDIR}/git/llvm"
LLVM_INSTALL_DIR = "${WORKDIR}/llvm-install"
--
2.17.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 16/16] python3-pygments: update to 2.5.2
2019-12-19 13:22 [PATCH 01/16] resolvconf: update to 1.80 Alexander Kanavin
` (13 preceding siblings ...)
2019-12-19 13:23 ` [PATCH 15/16] llvm: fix upstream version check Alexander Kanavin
@ 2019-12-19 13:23 ` Alexander Kanavin
2019-12-19 13:32 ` ✗ patchtest: failure for "resolvconf: update to 1.80..." and 15 more Patchwork
15 siblings, 0 replies; 23+ messages in thread
From: Alexander Kanavin @ 2019-12-19 13:23 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../{python3-pygments_2.4.2.bb => python3-pygments_2.5.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python3-pygments_2.4.2.bb => python3-pygments_2.5.2.bb} (75%)
diff --git a/meta/recipes-devtools/python/python3-pygments_2.4.2.bb b/meta/recipes-devtools/python/python3-pygments_2.5.2.bb
similarity index 75%
rename from meta/recipes-devtools/python/python3-pygments_2.4.2.bb
rename to meta/recipes-devtools/python/python3-pygments_2.5.2.bb
index 35c0ac6a578..474b95494a2 100644
--- a/meta/recipes-devtools/python/python3-pygments_2.4.2.bb
+++ b/meta/recipes-devtools/python/python3-pygments_2.5.2.bb
@@ -5,8 +5,8 @@ LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e1d7b7bffbfeaa14083fd2bd3236aea8"
inherit setuptools3
-SRC_URI[md5sum] = "5ecc3fbb2a783e917b369271fc0e6cd1"
-SRC_URI[sha256sum] = "881c4c157e45f30af185c1ffe8d549d48ac9127433f2c380c24b84572ad66297"
+SRC_URI[md5sum] = "465a35559863089d959d783a69f79b9f"
+SRC_URI[sha256sum] = "98c8aa5a9f778fcd1026a17361ddaf7330d1b7c62ae97c3bb0ae73e0b9b6b0fe"
DEPENDS += "\
${PYTHON_PN} \
--
2.17.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* ✗ patchtest: failure for "resolvconf: update to 1.80..." and 15 more
2019-12-19 13:22 [PATCH 01/16] resolvconf: update to 1.80 Alexander Kanavin
` (14 preceding siblings ...)
2019-12-19 13:23 ` [PATCH 16/16] python3-pygments: update to 2.5.2 Alexander Kanavin
@ 2019-12-19 13:32 ` Patchwork
2019-12-19 13:43 ` Alexander Kanavin
15 siblings, 1 reply; 23+ messages in thread
From: Patchwork @ 2019-12-19 13:32 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: openembedded-core
== Series Details ==
Series: "resolvconf: update to 1.80..." and 15 more
Revision: 1
URL : https://patchwork.openembedded.org/series/21685/
State : failure
== Summary ==
Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:
* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at d6c62cc030)
If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).
---
Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
^ permalink raw reply [flat|nested] 23+ messages in thread