Skip to contentSkip to conversation

openssh: Rename .bbappend to match new version from oe-core

PATCH Superseded Martin Jansa 1 participant 4 messages Mar 3, 2014

lore
Share & tools
lore

Martin Jansa

author
#0 lore raw

PATCH 1/2 openssh: Rename .bbappend to match new version from oe-core

Signed-off-by Martin Jansa <[email protected]>
---
 .../openssh/{openssh_6.4p1.bbappend => openssh_6.5p1.bbappend}            | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename meta-systemd/oe-core/recipes-connectivity/openssh/{openssh_6.4p1.bbappend => openssh_6.5p1.bbappend} (100%)
meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.5p1.bbappend renamed from meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.4p1.bbappend +0 -0
similarity index 100%
rename from meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.4p1.bbappend
rename to meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.5p1.bbappend
Signature · 1 line
1.9.0
author
#1 lore raw

PATCH 2/2 wpa-supplicant: Rename .bbappend to match new version from oe-core

Signed-off-by Martin Jansa <[email protected]>
---
 .../{wpa-supplicant_2.0.bbappend => wpa-supplicant_2.1.bbappend}        | 2 --
 1 file changed, 2 deletions(-)
 rename meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/{wpa-supplicant_2.0.bbappend => wpa-supplicant_2.1.bbappend} (77%)
meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.1.bbappend renamed from meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bbappend +0 -2
similarity index 77%
rename from meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bbappend
rename to meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.1.bbappend
index cffb898..f006b3f 100644
@@ -1,5 +1,3 @@
-PRINC := "${@int(PRINC) + 4}"
-
 RPROVIDES_${PN} += "${PN}-systemd"
 RREPLACES_${PN} += "${PN}-systemd"
 RCONFLICTS_${PN} += "${PN}-systemd"
Signature · 1 line
1.9.0
author
#2 lore raw

PATCH v2 1/2 openssh: Rename .bbappend to match new version from oe-core

In reply to Martin Jansa
Signed-off-by Martin Jansa <[email protected]>
---
 meta-systemd/oe-core/recipes-connectivity/openssh/openssh_%.bbappend   | 3 +++
 .../oe-core/recipes-connectivity/openssh/openssh_6.4p1.bbappend        | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 meta-systemd/oe-core/recipes-connectivity/openssh/openssh_%.bbappend
 delete mode 100644 meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.4p1.bbappend
meta-systemd/oe-core/recipes-connectivity/openssh/openssh_%.bbappend new file +3 -0
new file mode 100644
index 0000000..dadbc14
@@ -0,0 +1,3 @@
+RPROVIDES_${PN}-sshd += "${PN}-sshd-systemd"
+RREPLACES_${PN}-sshd += "${PN}-sshd-systemd"
+RCONFLICTS_${PN}-sshd += "${PN}-sshd-systemd"
meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.4p1.bbappend deleted +0 -3
deleted file mode 100644
index dadbc14..0000000
@@ -1,3 +0,0 @@
-RPROVIDES_${PN}-sshd += "${PN}-sshd-systemd"
-RREPLACES_${PN}-sshd += "${PN}-sshd-systemd"
-RCONFLICTS_${PN}-sshd += "${PN}-sshd-systemd"
Signature · 1 line
1.9.0
author
#3 lore raw

PATCH v2 2/2 wpa-supplicant: Rename .bbappend to match new version from oe-core

Signed-off-by Martin Jansa <[email protected]>
---
 .../recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend    | 3 +++
 .../recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bbappend  | 5 -----
 2 files changed, 3 insertions(+), 5 deletions(-)
 create mode 100644 meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend
 delete mode 100644 meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bbappend
meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend new file +3 -0
new file mode 100644
index 0000000..f006b3f
@@ -0,0 +1,3 @@
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bbappend deleted +0 -5
deleted file mode 100644
index cffb898..0000000
@@ -1,5 +0,0 @@
-PRINC := "${@int(PRINC) + 4}"
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
Signature · 1 line
1.9.0