From e558dba5db1654205c44981f46be9d1f56d8a530 Mon Sep 17 00:00:00 2001 From: Xin Ouyang Date: Wed, 20 Feb 2013 14:56:33 +0800 Subject: packages: uprev bbappends to fit oe-core Signed-off-by: Xin Ouyang --- recipes-connectivity/openssh/openssh_6.0p1.bbappend | 5 ----- recipes-connectivity/openssh/openssh_6.1p1.bbappend | 5 +++++ recipes-core/dbus/dbus_1.5.12.bbappend | 3 --- recipes-core/dbus/dbus_1.6.8.bbappend | 3 +++ recipes-core/libcgroup/libcgroup_0.37.1.bbappend | 12 ------------ recipes-core/libcgroup/libcgroup_0.38.bbappend | 12 ++++++++++++ recipes-core/util-linux/util-linux_2.22.1.bbappend | 8 -------- recipes-core/util-linux/util-linux_2.22.2.bbappend | 8 ++++++++ recipes-extended/net-tools/net-tools_1.60-23.bbappend | 11 ----------- recipes-extended/net-tools/net-tools_1.60-24.2.bbappend | 11 +++++++++++ recipes-extended/sudo/sudo_1.8.5p2.bbappend | 3 --- recipes-extended/sudo/sudo_1.8.6p4.bbappend | 3 +++ recipes-graphics/mesa/mesa-dri_9.0.1.bbappend | 3 --- recipes-graphics/mesa/mesa-dri_9.0.2.bbappend | 3 +++ 14 files changed, 45 insertions(+), 45 deletions(-) delete mode 100644 recipes-connectivity/openssh/openssh_6.0p1.bbappend create mode 100644 recipes-connectivity/openssh/openssh_6.1p1.bbappend delete mode 100644 recipes-core/dbus/dbus_1.5.12.bbappend create mode 100644 recipes-core/dbus/dbus_1.6.8.bbappend delete mode 100644 recipes-core/libcgroup/libcgroup_0.37.1.bbappend create mode 100644 recipes-core/libcgroup/libcgroup_0.38.bbappend delete mode 100644 recipes-core/util-linux/util-linux_2.22.1.bbappend create mode 100644 recipes-core/util-linux/util-linux_2.22.2.bbappend delete mode 100644 recipes-extended/net-tools/net-tools_1.60-23.bbappend create mode 100644 recipes-extended/net-tools/net-tools_1.60-24.2.bbappend delete mode 100644 recipes-extended/sudo/sudo_1.8.5p2.bbappend create mode 100644 recipes-extended/sudo/sudo_1.8.6p4.bbappend delete mode 100644 recipes-graphics/mesa/mesa-dri_9.0.1.bbappend create mode 100644 recipes-graphics/mesa/mesa-dri_9.0.2.bbappend diff --git a/recipes-connectivity/openssh/openssh_6.0p1.bbappend b/recipes-connectivity/openssh/openssh_6.0p1.bbappend deleted file mode 100644 index 698f4ab..0000000 --- a/recipes-connectivity/openssh/openssh_6.0p1.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -PR .= ".3" - -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -inherit with-selinux diff --git a/recipes-connectivity/openssh/openssh_6.1p1.bbappend b/recipes-connectivity/openssh/openssh_6.1p1.bbappend new file mode 100644 index 0000000..698f4ab --- /dev/null +++ b/recipes-connectivity/openssh/openssh_6.1p1.bbappend @@ -0,0 +1,5 @@ +PR .= ".3" + +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +inherit with-selinux diff --git a/recipes-core/dbus/dbus_1.5.12.bbappend b/recipes-core/dbus/dbus_1.5.12.bbappend deleted file mode 100644 index 366fdf5..0000000 --- a/recipes-core/dbus/dbus_1.5.12.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -PR .= ".2" - -inherit enable-selinux diff --git a/recipes-core/dbus/dbus_1.6.8.bbappend b/recipes-core/dbus/dbus_1.6.8.bbappend new file mode 100644 index 0000000..366fdf5 --- /dev/null +++ b/recipes-core/dbus/dbus_1.6.8.bbappend @@ -0,0 +1,3 @@ +PR .= ".2" + +inherit enable-selinux diff --git a/recipes-core/libcgroup/libcgroup_0.37.1.bbappend b/recipes-core/libcgroup/libcgroup_0.37.1.bbappend deleted file mode 100644 index b7e0c5f..0000000 --- a/recipes-core/libcgroup/libcgroup_0.37.1.bbappend +++ /dev/null @@ -1,12 +0,0 @@ -PR .= ".3" - -EXTRA_OECONF_virtclass-native = "--enable-pam=no" - -do_install_append() { - test ! -f ${D}${base_libdir}/security/pam_cgroup.so.0.0.0 || { - mv -f ${D}${base_libdir}/security/pam_cgroup.so.0.0.0 ${D}${base_libdir}/security/pam_cgroup.so - rm -f ${D}${base_libdir}/security/pam_cgroup.so.* - } -} - -BBCLASSEXTEND = "native" diff --git a/recipes-core/libcgroup/libcgroup_0.38.bbappend b/recipes-core/libcgroup/libcgroup_0.38.bbappend new file mode 100644 index 0000000..b7e0c5f --- /dev/null +++ b/recipes-core/libcgroup/libcgroup_0.38.bbappend @@ -0,0 +1,12 @@ +PR .= ".3" + +EXTRA_OECONF_virtclass-native = "--enable-pam=no" + +do_install_append() { + test ! -f ${D}${base_libdir}/security/pam_cgroup.so.0.0.0 || { + mv -f ${D}${base_libdir}/security/pam_cgroup.so.0.0.0 ${D}${base_libdir}/security/pam_cgroup.so + rm -f ${D}${base_libdir}/security/pam_cgroup.so.* + } +} + +BBCLASSEXTEND = "native" diff --git a/recipes-core/util-linux/util-linux_2.22.1.bbappend b/recipes-core/util-linux/util-linux_2.22.1.bbappend deleted file mode 100644 index bd8021b..0000000 --- a/recipes-core/util-linux/util-linux_2.22.1.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -PR .= ".3" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://fix-libmount_la_DEPENDENCIES.patch \ - " - -inherit with-selinux diff --git a/recipes-core/util-linux/util-linux_2.22.2.bbappend b/recipes-core/util-linux/util-linux_2.22.2.bbappend new file mode 100644 index 0000000..bd8021b --- /dev/null +++ b/recipes-core/util-linux/util-linux_2.22.2.bbappend @@ -0,0 +1,8 @@ +PR .= ".3" + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://fix-libmount_la_DEPENDENCIES.patch \ + " + +inherit with-selinux diff --git a/recipes-extended/net-tools/net-tools_1.60-23.bbappend b/recipes-extended/net-tools/net-tools_1.60-23.bbappend deleted file mode 100644 index e99a5bc..0000000 --- a/recipes-extended/net-tools/net-tools_1.60-23.bbappend +++ /dev/null @@ -1,11 +0,0 @@ -PR .= ".2" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://netstat-selinux-support.patch" - -inherit selinux - -DEPENDS += "${LIBSELINUX}" - -EXTRA_OEMAKE += "${@target_selinux(d, 'HAVE_SELINUX=1', 'HAVE_SELINUX=0')}" diff --git a/recipes-extended/net-tools/net-tools_1.60-24.2.bbappend b/recipes-extended/net-tools/net-tools_1.60-24.2.bbappend new file mode 100644 index 0000000..e99a5bc --- /dev/null +++ b/recipes-extended/net-tools/net-tools_1.60-24.2.bbappend @@ -0,0 +1,11 @@ +PR .= ".2" + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://netstat-selinux-support.patch" + +inherit selinux + +DEPENDS += "${LIBSELINUX}" + +EXTRA_OEMAKE += "${@target_selinux(d, 'HAVE_SELINUX=1', 'HAVE_SELINUX=0')}" diff --git a/recipes-extended/sudo/sudo_1.8.5p2.bbappend b/recipes-extended/sudo/sudo_1.8.5p2.bbappend deleted file mode 100644 index 5ad8973..0000000 --- a/recipes-extended/sudo/sudo_1.8.5p2.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -PR .= ".2" - -inherit with-selinux diff --git a/recipes-extended/sudo/sudo_1.8.6p4.bbappend b/recipes-extended/sudo/sudo_1.8.6p4.bbappend new file mode 100644 index 0000000..5ad8973 --- /dev/null +++ b/recipes-extended/sudo/sudo_1.8.6p4.bbappend @@ -0,0 +1,3 @@ +PR .= ".2" + +inherit with-selinux diff --git a/recipes-graphics/mesa/mesa-dri_9.0.1.bbappend b/recipes-graphics/mesa/mesa-dri_9.0.1.bbappend deleted file mode 100644 index 4d3925c..0000000 --- a/recipes-graphics/mesa/mesa-dri_9.0.1.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -PR .= ".1" - -inherit enable-selinux diff --git a/recipes-graphics/mesa/mesa-dri_9.0.2.bbappend b/recipes-graphics/mesa/mesa-dri_9.0.2.bbappend new file mode 100644 index 0000000..4d3925c --- /dev/null +++ b/recipes-graphics/mesa/mesa-dri_9.0.2.bbappend @@ -0,0 +1,3 @@ +PR .= ".1" + +inherit enable-selinux -- cgit v1.2.3-54-g00ecf