From 71e37693d60fd67260cb14de3e40ea6455788f58 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 27 Oct 2020 21:09:03 -0700 Subject: init-ifupdown: Merge all interface files for differnet qemus all these were exact copies, therefore just use qemuall to house this file as it will be same across all qemu machines Additionally, it can support out of tree qemu definitions better eg. qemuppc64 (From OE-Core rev: 7822880443ba474431a6a2c43c52406be995d9d4) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- .../init-ifupdown/init-ifupdown-1.0/qemuall/interfaces | 5 +++++ .../init-ifupdown/init-ifupdown-1.0/qemuarm/interfaces | 5 ----- .../init-ifupdown/init-ifupdown-1.0/qemuarm64/interfaces | 5 ----- .../init-ifupdown/init-ifupdown-1.0/qemuarmv6/interfaces | 5 ----- .../init-ifupdown/init-ifupdown-1.0/qemuarmv7/interfaces | 5 ----- .../init-ifupdown/init-ifupdown-1.0/qemumips/interfaces | 8 -------- .../init-ifupdown/init-ifupdown-1.0/qemumips64/interfaces | 8 -------- .../init-ifupdown/init-ifupdown-1.0/qemuppc/interfaces | 8 -------- .../init-ifupdown/init-ifupdown-1.0/qemuriscv32/interfaces | 8 -------- .../init-ifupdown/init-ifupdown-1.0/qemuriscv64/interfaces | 8 -------- .../init-ifupdown/init-ifupdown-1.0/qemush4/interfaces | 8 -------- .../init-ifupdown/init-ifupdown-1.0/qemux86-64/interfaces | 8 -------- .../init-ifupdown/init-ifupdown-1.0/qemux86/interfaces | 8 -------- 13 files changed, 5 insertions(+), 84 deletions(-) create mode 100644 meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuall/interfaces delete mode 100644 meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm/interfaces delete mode 100644 meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm64/interfaces delete mode 100644 meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv6/interfaces delete mode 100644 meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv7/interfaces delete mode 100644 meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips/interfaces delete mode 100644 meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips64/interfaces delete mode 100644 meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuppc/interfaces delete mode 100644 meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuriscv32/interfaces delete mode 100644 meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuriscv64/interfaces delete mode 100644 meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemush4/interfaces delete mode 100644 meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86-64/interfaces delete mode 100644 meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86/interfaces diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuall/interfaces b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuall/interfaces new file mode 100644 index 0000000000..16967763e5 --- /dev/null +++ b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuall/interfaces @@ -0,0 +1,5 @@ +# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) + +# The loopback interface +auto lo +iface lo inet loopback diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm/interfaces b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm/interfaces deleted file mode 100644 index 16967763e5..0000000000 --- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm/interfaces +++ /dev/null @@ -1,5 +0,0 @@ -# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) - -# The loopback interface -auto lo -iface lo inet loopback diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm64/interfaces b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm64/interfaces deleted file mode 100644 index 16967763e5..0000000000 --- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm64/interfaces +++ /dev/null @@ -1,5 +0,0 @@ -# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) - -# The loopback interface -auto lo -iface lo inet loopback diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv6/interfaces b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv6/interfaces deleted file mode 100644 index 16967763e5..0000000000 --- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv6/interfaces +++ /dev/null @@ -1,5 +0,0 @@ -# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) - -# The loopback interface -auto lo -iface lo inet loopback diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv7/interfaces b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv7/interfaces deleted file mode 100644 index 16967763e5..0000000000 --- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv7/interfaces +++ /dev/null @@ -1,5 +0,0 @@ -# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) - -# The loopback interface -auto lo -iface lo inet loopback diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips/interfaces b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips/interfaces deleted file mode 100644 index f62b9a897d..0000000000 --- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips/interfaces +++ /dev/null @@ -1,8 +0,0 @@ -# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) - -# The loopback interface -auto lo -iface lo inet loopback - - - diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips64/interfaces b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips64/interfaces deleted file mode 100644 index f62b9a897d..0000000000 --- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips64/interfaces +++ /dev/null @@ -1,8 +0,0 @@ -# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) - -# The loopback interface -auto lo -iface lo inet loopback - - - diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuppc/interfaces b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuppc/interfaces deleted file mode 100644 index f62b9a897d..0000000000 --- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuppc/interfaces +++ /dev/null @@ -1,8 +0,0 @@ -# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) - -# The loopback interface -auto lo -iface lo inet loopback - - - diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuriscv32/interfaces b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuriscv32/interfaces deleted file mode 100644 index f62b9a897d..0000000000 --- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuriscv32/interfaces +++ /dev/null @@ -1,8 +0,0 @@ -# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) - -# The loopback interface -auto lo -iface lo inet loopback - - - diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuriscv64/interfaces b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuriscv64/interfaces deleted file mode 100644 index f62b9a897d..0000000000 --- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuriscv64/interfaces +++ /dev/null @@ -1,8 +0,0 @@ -# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) - -# The loopback interface -auto lo -iface lo inet loopback - - - diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemush4/interfaces b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemush4/interfaces deleted file mode 100644 index f62b9a897d..0000000000 --- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemush4/interfaces +++ /dev/null @@ -1,8 +0,0 @@ -# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) - -# The loopback interface -auto lo -iface lo inet loopback - - - diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86-64/interfaces b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86-64/interfaces deleted file mode 100644 index f62b9a897d..0000000000 --- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86-64/interfaces +++ /dev/null @@ -1,8 +0,0 @@ -# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) - -# The loopback interface -auto lo -iface lo inet loopback - - - diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86/interfaces b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86/interfaces deleted file mode 100644 index f62b9a897d..0000000000 --- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86/interfaces +++ /dev/null @@ -1,8 +0,0 @@ -# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) - -# The loopback interface -auto lo -iface lo inet loopback - - - -- cgit v1.2.3-54-g00ecf