diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
| commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
| tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /poky/meta/recipes-core/ifupdown | |
| parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
| download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz | |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-core/ifupdown')
| -rw-r--r-- | poky/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch | 38 |
1 files changed, 11 insertions, 27 deletions
diff --git a/poky/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch b/poky/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch index 2013933b6..37a61c9bc 100644 --- a/poky/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch +++ b/poky/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch @@ -1,4 +1,4 @@ -From d88af5aa0312ea18aac791d66661da79b7bcd032 Mon Sep 17 00:00:00 2001 +From 7efe4676747e4e4a056b9bfb4e9424c8354e9996 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] inet[6].defn: fix inverted checks for loopback @@ -35,12 +35,13 @@ 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 | 148 +++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 74 insertions(+), 74 deletions(-) + inet.defn | 140 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/inet.defn b/inet.defn -index 75e6744..b5f5da2 100644 +index 75e6744..23c7756 100644 --- a/inet.defn +++ b/inet.defn @@ -6,10 +6,10 @@ method loopback @@ -48,11 +49,11 @@ index 75e6744..b5f5da2 100644 up - /bin/ip link set dev %iface% up if (!iface_is_lo()) -+ 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()) ++ ip link set dev %iface% down if (!iface_is_lo()) method static description @@ -211,23 +212,20 @@ index 75e6744..b5f5da2 100644 architecture kfreebsd -@@ -211,12 +211,12 @@ method loopback +@@ -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 \ -- if (!iface_is_lo()) + ifconfig %iface% 127.0.0.1 up \ -+ if (iface_is_lo()) + if (!iface_is_lo()) down - /sbin/ifconfig %iface% down \ -- if (!iface_is_lo()) + ifconfig %iface% down \ -+ if (iface_is_lo()) + if (!iface_is_lo()) method static - description @@ -238,15 +238,15 @@ method static hwaddress cleanup_hwaddress @@ -339,20 +337,6 @@ index 75e6744..b5f5da2 100644 architecture hurd method loopback -@@ -367,11 +367,11 @@ method loopback - - up - inetutils-ifconfig --interface %iface% --address 127.0.0.1 --up \ -- if (!iface_is_lo()) -+ if (iface_is_lo()) - - down - inetutils-ifconfig --interface %iface% --down \ -- if (!iface_is_lo()) -+ if (iface_is_lo()) - - method static - description @@ -432,23 +432,23 @@ method dhcp up @@ -418,5 +402,5 @@ index 75e6744..b5f5da2 100644 - /usr/sbin/avahi-autoipd --kill %iface% + avahi-autoipd --kill %iface% -- -2.4.0 +2.7.4 |