[meta-selinux][ 0/4] More whack-a-mole with version numbers.

[meta-selinux][ 0/4] More whack-a-mole with version numbers.

[Philip Tricca]

This is another round of renaming the meta-selinux bbappends to use
wild cards. The three recipes renamed here had no patches to port.
They're basically 3-4 line recipes that enable SELinux or add a 
config file. Per previous guidance I've removed PRs so hopefully
this is still the right thing to do.

One oddity here is the change made to the ustr recipe. It was using
a variable I've never seen before and failing to fetch the SRC_URI.
I think this variable was a typo and after changing ${BPV} -> ${PV}
the expected behavior was restored.

Philip Tricca (4):
  sysklogd: Use wildcard for version and remove PR.
  dhcp: Use wildcard for version number.
  coreutils: Use wildcard for version and remove PR.
  ustr: Fix use of bad variable in SRC_URI.

 recipes-connectivity/dhcp/dhcp_%.bbappend       |    3 +++
 recipes-connectivity/dhcp/dhcp_4.3.0.bbappend   |    3 ---
 recipes-core/coreutils/coreutils_%.bbappend     |    1 +
 recipes-core/coreutils/coreutils_8.22.bbappend  |    3 ---
 recipes-extended/sysklogd/sysklogd_%.bbappend   |    1 +
 recipes-extended/sysklogd/sysklogd_1.5.bbappend |    3 ---
 recipes-extended/ustr/ustr_1.0.4.bb             |    2 +-
 7 files changed, 6 insertions(+), 10 deletions(-)
 create mode 100644 recipes-connectivity/dhcp/dhcp_%.bbappend
 delete mode 100644 recipes-connectivity/dhcp/dhcp_4.3.0.bbappend
 create mode 100644 recipes-core/coreutils/coreutils_%.bbappend
 delete mode 100644 recipes-core/coreutils/coreutils_8.22.bbappend
 create mode 100644 recipes-extended/sysklogd/sysklogd_%.bbappend
 delete mode 100644 recipes-extended/sysklogd/sysklogd_1.5.bbappend

-- 
1.7.10.4

[meta-selinux][ 1/4] sysklogd: Use wildcard for version and remove PR.

[Philip Tricca]

Signed-off-by: Philip Tricca <flihp@twobit.us>
---
 recipes-extended/sysklogd/sysklogd_%.bbappend   |    1 +
 recipes-extended/sysklogd/sysklogd_1.5.bbappend |    3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)
 create mode 100644 recipes-extended/sysklogd/sysklogd_%.bbappend
 delete mode 100644 recipes-extended/sysklogd/sysklogd_1.5.bbappend

diff --git a/recipes-extended/sysklogd/sysklogd_%.bbappend b/recipes-extended/sysklogd/sysklogd_%.bbappend
new file mode 100644
index 0000000..81fe7b7
--- /dev/null
+++ b/recipes-extended/sysklogd/sysklogd_%.bbappend
@@ -0,0 +1 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
diff --git a/recipes-extended/sysklogd/sysklogd_1.5.bbappend b/recipes-extended/sysklogd/sysklogd_1.5.bbappend
deleted file mode 100644
index 0581083..0000000
--- a/recipes-extended/sysklogd/sysklogd_1.5.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-PR .= ".2"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-- 
1.7.10.4

[meta-selinux][ 2/4] dhcp: Use wildcard for version number.

[Philip Tricca]

Signed-off-by: Philip Tricca <flihp@twobit.us>
---
 recipes-connectivity/dhcp/dhcp_%.bbappend     |    3 +++
 recipes-connectivity/dhcp/dhcp_4.3.0.bbappend |    3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 recipes-connectivity/dhcp/dhcp_%.bbappend
 delete mode 100644 recipes-connectivity/dhcp/dhcp_4.3.0.bbappend

diff --git a/recipes-connectivity/dhcp/dhcp_%.bbappend b/recipes-connectivity/dhcp/dhcp_%.bbappend
new file mode 100644
index 0000000..2d2232c
--- /dev/null
+++ b/recipes-connectivity/dhcp/dhcp_%.bbappend
@@ -0,0 +1,3 @@
+inherit selinux
+
+FILESEXTRAPATHS_prepend := "${@target_selinux(d, '${THISDIR}/files:')}"
diff --git a/recipes-connectivity/dhcp/dhcp_4.3.0.bbappend b/recipes-connectivity/dhcp/dhcp_4.3.0.bbappend
deleted file mode 100644
index 2d2232c..0000000
--- a/recipes-connectivity/dhcp/dhcp_4.3.0.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit selinux
-
-FILESEXTRAPATHS_prepend := "${@target_selinux(d, '${THISDIR}/files:')}"
-- 
1.7.10.4

[meta-selinux][ 3/4] coreutils: Use wildcard for version and remove PR.

[Philip Tricca]

Signed-off-by: Philip Tricca <flihp@twobit.us>
---
 recipes-core/coreutils/coreutils_%.bbappend    |    1 +
 recipes-core/coreutils/coreutils_8.22.bbappend |    3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)
 create mode 100644 recipes-core/coreutils/coreutils_%.bbappend
 delete mode 100644 recipes-core/coreutils/coreutils_8.22.bbappend

diff --git a/recipes-core/coreutils/coreutils_%.bbappend b/recipes-core/coreutils/coreutils_%.bbappend
new file mode 100644
index 0000000..c1e8ed6
--- /dev/null
+++ b/recipes-core/coreutils/coreutils_%.bbappend
@@ -0,0 +1 @@
+inherit with-selinux
diff --git a/recipes-core/coreutils/coreutils_8.22.bbappend b/recipes-core/coreutils/coreutils_8.22.bbappend
deleted file mode 100644
index cef8b67..0000000
--- a/recipes-core/coreutils/coreutils_8.22.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-PR .= ".1"
-
-inherit with-selinux
-- 
1.7.10.4

[meta-selinux][ 4/4] ustr: Fix use of bad variable in SRC_URI.

[Philip Tricca]

Signed-off-by: Philip Tricca <flihp@twobit.us>
---
 recipes-extended/ustr/ustr_1.0.4.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-extended/ustr/ustr_1.0.4.bb b/recipes-extended/ustr/ustr_1.0.4.bb
index a0a1e41..cdb78ad 100644
--- a/recipes-extended/ustr/ustr_1.0.4.bb
+++ b/recipes-extended/ustr/ustr_1.0.4.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c79c6e2ae13418d16d7dc82df960a1e7 \
 		    file://LICENSE_MIT;md5=c61e779b782608472bd87593c3c3916f"
 
 SRC_URI = "\
-    http://www.and.org/ustr/${BPV}/${BPN}-${PV}.tar.bz2 \
+    http://www.and.org/ustr/${PV}/${BPN}-${PV}.tar.bz2 \
     file://ustr-makefile-fix.patch;patch=1 \
     file://ustr-fix__va_copy-not-defined.patch;patch=2 \
     file://ustr-c99-inline.patch;patch=3"
-- 
1.7.10.4

Re: [meta-selinux][ 0/4] More whack-a-mole with version numbers.

[Philip Tricca]

Forgot to copy the maintainer ... again :)

On 01/28/2015 10:36 AM, Philip Tricca wrote:
> This is another round of renaming the meta-selinux bbappends to use
> wild cards. The three recipes renamed here had no patches to port.
> They're basically 3-4 line recipes that enable SELinux or add a 
> config file. Per previous guidance I've removed PRs so hopefully
> this is still the right thing to do.
> 
> One oddity here is the change made to the ustr recipe. It was using
> a variable I've never seen before and failing to fetch the SRC_URI.
> I think this variable was a typo and after changing ${BPV} -> ${PV}
> the expected behavior was restored.
> 
> Philip Tricca (4):
>   sysklogd: Use wildcard for version and remove PR.
>   dhcp: Use wildcard for version number.
>   coreutils: Use wildcard for version and remove PR.
>   ustr: Fix use of bad variable in SRC_URI.
> 
>  recipes-connectivity/dhcp/dhcp_%.bbappend       |    3 +++
>  recipes-connectivity/dhcp/dhcp_4.3.0.bbappend   |    3 ---
>  recipes-core/coreutils/coreutils_%.bbappend     |    1 +
>  recipes-core/coreutils/coreutils_8.22.bbappend  |    3 ---
>  recipes-extended/sysklogd/sysklogd_%.bbappend   |    1 +
>  recipes-extended/sysklogd/sysklogd_1.5.bbappend |    3 ---
>  recipes-extended/ustr/ustr_1.0.4.bb             |    2 +-
>  7 files changed, 6 insertions(+), 10 deletions(-)
>  create mode 100644 recipes-connectivity/dhcp/dhcp_%.bbappend
>  delete mode 100644 recipes-connectivity/dhcp/dhcp_4.3.0.bbappend
>  create mode 100644 recipes-core/coreutils/coreutils_%.bbappend
>  delete mode 100644 recipes-core/coreutils/coreutils_8.22.bbappend
>  create mode 100644 recipes-extended/sysklogd/sysklogd_%.bbappend
>  delete mode 100644 recipes-extended/sysklogd/sysklogd_1.5.bbappend
>