Skip to contentSkip to conversation

Bump versions to catch up with oe-core master.

PATCH Applied Philip Tricca 2 participants 8 messages Nov 16, 2013 – Dec 4, 2013

lore
Share & tools
lore
#0 lore raw

v2 cover Bump versions to catch up with oe-core master.

This series includes the low impact changes necessary to bring meta-selinux up to speed with a few upgrades in oe-core master. The bulk of this is just renaming bbappends and minor tweaks to existing patches. I've omitted the work necessary to get tar from 1.26 to 1.27 on account of the addition of support for attrs/xattrs/acls in the new version. ACLs don't look to work out of the box so that new work should be in a separate patch.

Philip Tricca (6):
glib-2.0: rename bbappend from 2.38.0 to 2.38.1
mesa: rename bbappend from 9.1.6 to 9.2.2
gnupg: rename bbappend from 2.0.21 to 2.0.22
openssh: rename bbappend from 6.2p2 to 6.4p1
sudo: rename bbappend from 1.8.7 to 1.8.8
at: bump from 3.1.13 to 3.1.14

 recipes-connectivity/openssh/openssh_6.2p2.bbappend |   13 -------------
 recipes-connectivity/openssh/openssh_6.4p1.bbappend |   13 +++++++++++++
 recipes-core/glib-2.0/glib-2.0_2.38.0.bbappend      |    1 -
 recipes-core/glib-2.0/glib-2.0_2.38.1.bbappend      |    1 +
 recipes-extended/at/at/at-3.1.13-selinux.patch      |    4 ++--
 recipes-extended/at/at_3.1.13.bbappend              |    7 -------
 recipes-extended/at/at_3.1.14.bbappend              |    7 +++++++
 recipes-extended/sudo/sudo_1.8.7.bbappend           |    3 ---
 recipes-extended/sudo/sudo_1.8.8.bbappend           |    3 +++
 recipes-graphics/mesa/mesa_9.1.6.bbappend           |    1 -
 recipes-graphics/mesa/mesa_9.2.2.bbappend           |    1 +
 recipes-support/gnupg/gnupg_2.0.21.bbappend         |    5 -----
 recipes-support/gnupg/gnupg_2.0.22.bbappend         |    5 +++++
 13 files changed, 32 insertions(+), 32 deletions(-)
 delete mode 100644 recipes-connectivity/openssh/openssh_6.2p2.bbappend
 create mode 100644 recipes-connectivity/openssh/openssh_6.4p1.bbappend
 delete mode 100644 recipes-core/glib-2.0/glib-2.0_2.38.0.bbappend
 create mode 100644 recipes-core/glib-2.0/glib-2.0_2.38.1.bbappend
 delete mode 100644 recipes-extended/at/at_3.1.13.bbappend
 create mode 100644 recipes-extended/at/at_3.1.14.bbappend
 delete mode 100644 recipes-extended/sudo/sudo_1.8.7.bbappend
 create mode 100644 recipes-extended/sudo/sudo_1.8.8.bbappend
 delete mode 100644 recipes-graphics/mesa/mesa_9.1.6.bbappend
 create mode 100644 recipes-graphics/mesa/mesa_9.2.2.bbappend
 delete mode 100644 recipes-support/gnupg/gnupg_2.0.21.bbappend
 create mode 100644 recipes-support/gnupg/gnupg_2.0.22.bbappend
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH v2 1/6 glib-2.0: rename bbappend from 2.38.0 to 2.38.1

---
 recipes-core/glib-2.0/glib-2.0_2.38.0.bbappend |    1 -
 recipes-core/glib-2.0/glib-2.0_2.38.1.bbappend |    1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 recipes-core/glib-2.0/glib-2.0_2.38.0.bbappend
 create mode 100644 recipes-core/glib-2.0/glib-2.0_2.38.1.bbappend
recipes-core/glib-2.0/glib-2.0_2.38.0.bbappend deleted +0 -1
deleted file mode 100644
index 8c11cac..0000000
@@ -1 +0,0 @@
-inherit enable-selinux
recipes-core/glib-2.0/glib-2.0_2.38.1.bbappend new file +1 -0
new file mode 100644
index 0000000..8c11cac
@@ -0,0 +1 @@
+inherit enable-selinux
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH v2 2/6 mesa: rename bbappend from 9.1.6 to 9.2.2

In reply to Philip Tricca
---
 recipes-graphics/mesa/mesa_9.1.6.bbappend |    1 -
 recipes-graphics/mesa/mesa_9.2.2.bbappend |    1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 recipes-graphics/mesa/mesa_9.1.6.bbappend
 create mode 100644 recipes-graphics/mesa/mesa_9.2.2.bbappend
recipes-graphics/mesa/mesa_9.1.6.bbappend deleted +0 -1
deleted file mode 100644
index 8c11cac..0000000
@@ -1 +0,0 @@
-inherit enable-selinux
recipes-graphics/mesa/mesa_9.2.2.bbappend new file +1 -0
new file mode 100644
index 0000000..8c11cac
@@ -0,0 +1 @@
+inherit enable-selinux
Signature · 1 line
1.7.10.4
#3 lore raw

PATCH v2 3/6 gnupg: rename bbappend from 2.0.21 to 2.0.22

In reply to Philip Tricca
---
 recipes-support/gnupg/gnupg_2.0.21.bbappend |    5 -----
 recipes-support/gnupg/gnupg_2.0.22.bbappend |    5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 recipes-support/gnupg/gnupg_2.0.21.bbappend
 create mode 100644 recipes-support/gnupg/gnupg_2.0.22.bbappend
recipes-support/gnupg/gnupg_2.0.21.bbappend deleted +0 -5
deleted file mode 100644
index dddd945..0000000
@@ -1,5 +0,0 @@
-PR .= ".1"
-
-inherit enable-selinux
-# gnupg will not build with libselinux, so remove the depend
-PACKAGECONFIG[selinux] = "--enable-selinux-support,--disable-selinux-support,,"
recipes-support/gnupg/gnupg_2.0.22.bbappend new file +5 -0
new file mode 100644
index 0000000..dddd945
@@ -0,0 +1,5 @@
+PR .= ".1"
+
+inherit enable-selinux
+# gnupg will not build with libselinux, so remove the depend
+PACKAGECONFIG[selinux] = "--enable-selinux-support,--disable-selinux-support,,"
Signature · 1 line
1.7.10.4
#4 lore raw

PATCH v2 4/6 openssh: rename bbappend from 6.2p2 to 6.4p1

In reply to Philip Tricca
---
 recipes-connectivity/openssh/openssh_6.2p2.bbappend |   13 -------------
 recipes-connectivity/openssh/openssh_6.4p1.bbappend |   13 +++++++++++++
 2 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 recipes-connectivity/openssh/openssh_6.2p2.bbappend
 create mode 100644 recipes-connectivity/openssh/openssh_6.4p1.bbappend
recipes-connectivity/openssh/openssh_6.2p2.bbappend deleted +0 -13
deleted file mode 100644
index 223b8cf..0000000
@@ -1,13 +0,0 @@
-PR .= ".5"
-
-inherit with-selinux
-
-FILESEXTRAPATHS_prepend := "${@target_selinux(d, '${THISDIR}/files:')}"
-
-# There is no distro feature just for audit.  If we want it,
-# uncomment the following.
-#
-#PACKAGECONFIG += "${@target_selinux(d, 'audit')}"
-
-PACKAGECONFIG[audit] = "--with-audit=linux,--without-audit,audit,"
-
recipes-connectivity/openssh/openssh_6.4p1.bbappend new file +13 -0
new file mode 100644
index 0000000..223b8cf
@@ -0,0 +1,13 @@
+PR .= ".5"
+
+inherit with-selinux
+
+FILESEXTRAPATHS_prepend := "${@target_selinux(d, '${THISDIR}/files:')}"
+
+# There is no distro feature just for audit.  If we want it,
+# uncomment the following.
+#
+#PACKAGECONFIG += "${@target_selinux(d, 'audit')}"
+
+PACKAGECONFIG[audit] = "--with-audit=linux,--without-audit,audit,"
+
Signature · 1 line
1.7.10.4
#5 lore raw

PATCH v2 5/6 sudo: rename bbappend from 1.8.7 to 1.8.8

In reply to Philip Tricca
---
 recipes-extended/sudo/sudo_1.8.7.bbappend |    3 ---
 recipes-extended/sudo/sudo_1.8.8.bbappend |    3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 recipes-extended/sudo/sudo_1.8.7.bbappend
 create mode 100644 recipes-extended/sudo/sudo_1.8.8.bbappend
recipes-extended/sudo/sudo_1.8.7.bbappend deleted +0 -3
deleted file mode 100644
index 5ad8973..0000000
@@ -1,3 +0,0 @@
-PR .= ".2"
-
-inherit with-selinux
recipes-extended/sudo/sudo_1.8.8.bbappend new file +3 -0
new file mode 100644
index 0000000..5ad8973
@@ -0,0 +1,3 @@
+PR .= ".2"
+
+inherit with-selinux
Signature · 1 line
1.7.10.4
#6 lore raw

PATCH v2 6/6 at: bump from 3.1.13 to 3.1.14

In reply to Philip Tricca

This renames the bbappend as well as a minor tweak to the selinux patch.

---
 recipes-extended/at/at/at-3.1.13-selinux.patch |    4 ++--
 recipes-extended/at/at_3.1.13.bbappend         |    7 -------
 recipes-extended/at/at_3.1.14.bbappend         |    7 +++++++
 3 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 recipes-extended/at/at_3.1.13.bbappend
 create mode 100644 recipes-extended/at/at_3.1.14.bbappend
recipes-extended/at/at/at-3.1.13-selinux.patch +2 -2
index 5a08a43..4e5e18c 100644
@@ -28,8 +28,8 @@ index 10e7ed2..35792cd 100644
 	$(LN_S) -f at atrm
  
  atd: $(RUNOBJECTS)
--	$(CC) $(CFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(LDFLAGS)
-+	$(CC) $(CFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(SELINUXLIB) $(LDFLAGS)
+-	$(CC) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB)
++	$(CC) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(SELINUXLIB)
  
  y.tab.c y.tab.h: parsetime.y
 	$(YACC) -d parsetime.y
recipes-extended/at/at_3.1.13.bbappend deleted +0 -7
deleted file mode 100644
index f30abab..0000000
@@ -1,7 +0,0 @@
-PR .= ".2"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://at-3.1.13-selinux.patch"
-
-inherit with-selinux
recipes-extended/at/at_3.1.14.bbappend new file +7 -0
new file mode 100644
index 0000000..f30abab
@@ -0,0 +1,7 @@
+PR .= ".2"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://at-3.1.13-selinux.patch"
+
+inherit with-selinux
Signature · 1 line
1.7.10.4
#7 lore raw
In reply to Philip Tricca

Merged, thanks.

-J.

Quoted 42 lines · [[meta-selinux][PATCH v2 0/6] Bump versions to catch up with oe-core master.]…

This series includes the low impact changes necessary to bring meta-selinux up to speed with a few upgrades in oe-core master. The bulk of this is just renaming bbappends and minor tweaks to existing patches. I've omitted the work necessary to get tar from 1.26 to 1.27 on account of the addition of support for attrs/xattrs/acls in the new version. ACLs don't look to work out of the box so that new work should be in a separate patch.

Philip Tricca (6):
glib-2.0: rename bbappend from 2.38.0 to 2.38.1
mesa: rename bbappend from 9.1.6 to 9.2.2
gnupg: rename bbappend from 2.0.21 to 2.0.22
openssh: rename bbappend from 6.2p2 to 6.4p1
sudo: rename bbappend from 1.8.7 to 1.8.8
at: bump from 3.1.13 to 3.1.14

 recipes-connectivity/openssh/openssh_6.2p2.bbappend |   13 -------------
 recipes-connectivity/openssh/openssh_6.4p1.bbappend |   13 +++++++++++++
 recipes-core/glib-2.0/glib-2.0_2.38.0.bbappend      |    1 -
 recipes-core/glib-2.0/glib-2.0_2.38.1.bbappend      |    1 +
 recipes-extended/at/at/at-3.1.13-selinux.patch      |    4 ++--
 recipes-extended/at/at_3.1.13.bbappend              |    7 -------
 recipes-extended/at/at_3.1.14.bbappend              |    7 +++++++
 recipes-extended/sudo/sudo_1.8.7.bbappend           |    3 ---
 recipes-extended/sudo/sudo_1.8.8.bbappend           |    3 +++
 recipes-graphics/mesa/mesa_9.1.6.bbappend           |    1 -
 recipes-graphics/mesa/mesa_9.2.2.bbappend           |    1 +
 recipes-support/gnupg/gnupg_2.0.21.bbappend         |    5 -----
 recipes-support/gnupg/gnupg_2.0.22.bbappend         |    5 +++++
 13 files changed, 32 insertions(+), 32 deletions(-)
 delete mode 100644 recipes-connectivity/openssh/openssh_6.2p2.bbappend
 create mode 100644 recipes-connectivity/openssh/openssh_6.4p1.bbappend
 delete mode 100644 recipes-core/glib-2.0/glib-2.0_2.38.0.bbappend
 create mode 100644 recipes-core/glib-2.0/glib-2.0_2.38.1.bbappend
 delete mode 100644 recipes-extended/at/at_3.1.13.bbappend
 create mode 100644 recipes-extended/at/at_3.1.14.bbappend
 delete mode 100644 recipes-extended/sudo/sudo_1.8.7.bbappend
 create mode 100644 recipes-extended/sudo/sudo_1.8.8.bbappend
 delete mode 100644 recipes-graphics/mesa/mesa_9.1.6.bbappend
 create mode 100644 recipes-graphics/mesa/mesa_9.2.2.bbappend
 delete mode 100644 recipes-support/gnupg/gnupg_2.0.21.bbappend
 create mode 100644 recipes-support/gnupg/gnupg_2.0.22.bbappend
Signature · 2 lines
-Joe MacDonald.
:wq