From f4a4f5f183b4bdca8d260bc35307df722cfa9928 Mon Sep 17 00:00:00 2001 From: Xin Ouyang Date: Tue, 25 Sep 2012 13:04:15 +0800 Subject: downrev bbappends for denzil branch recipes. Signed-off-by: Xin Ouyang --- recipes-connectivity/openssh/openssh_5.9p1.bbappend | 7 +++++++ recipes-connectivity/openssh/openssh_6.0p1.bbappend | 7 ------- recipes-connectivity/openssl/openssl_1.0.0i.bbappend | 3 +++ recipes-connectivity/openssl/openssl_1.0.0j.bbappend | 3 --- recipes-core/dbus/dbus_1.4.16.bbappend | 5 +++++ recipes-core/dbus/dbus_1.5.12.bbappend | 5 ----- recipes-core/glib-2.0/glib-2.0_2.30.3.bbappend | 5 +++++ recipes-core/glib-2.0/glib-2.0_2.32.4.bbappend | 5 ----- recipes-core/util-linux/util-linux_2.21.2.bbappend | 10 ---------- recipes-core/util-linux/util-linux_2.21.bbappend | 10 ++++++++++ recipes-devtools/rpm/rpm_5.4.0.bbappend | 14 ++++++++++++++ recipes-devtools/rpm/rpm_5.4.9.bbappend | 14 -------------- recipes-extended/lsof/lsof_4.85.bbappend | 14 ++++++++++++++ recipes-extended/lsof/lsof_4.86.bbappend | 14 -------------- recipes-extended/pam/libpam_1.1.5.bbappend | 12 ++++++++++++ recipes-extended/pam/libpam_1.1.6.bbappend | 13 ------------- recipes-extended/psmisc/psmisc_22.16.bbappend | 6 ++++++ recipes-extended/psmisc/psmisc_22.19.bbappend | 6 ------ recipes-extended/sudo/sudo_1.8.4p4.bbappend | 5 +++++ recipes-extended/sudo/sudo_1.8.5p2.bbappend | 5 ----- 20 files changed, 81 insertions(+), 82 deletions(-) create mode 100644 recipes-connectivity/openssh/openssh_5.9p1.bbappend delete mode 100644 recipes-connectivity/openssh/openssh_6.0p1.bbappend create mode 100644 recipes-connectivity/openssl/openssl_1.0.0i.bbappend delete mode 100644 recipes-connectivity/openssl/openssl_1.0.0j.bbappend create mode 100644 recipes-core/dbus/dbus_1.4.16.bbappend delete mode 100644 recipes-core/dbus/dbus_1.5.12.bbappend create mode 100644 recipes-core/glib-2.0/glib-2.0_2.30.3.bbappend delete mode 100644 recipes-core/glib-2.0/glib-2.0_2.32.4.bbappend delete mode 100644 recipes-core/util-linux/util-linux_2.21.2.bbappend create mode 100644 recipes-core/util-linux/util-linux_2.21.bbappend create mode 100644 recipes-devtools/rpm/rpm_5.4.0.bbappend delete mode 100644 recipes-devtools/rpm/rpm_5.4.9.bbappend create mode 100644 recipes-extended/lsof/lsof_4.85.bbappend delete mode 100644 recipes-extended/lsof/lsof_4.86.bbappend create mode 100644 recipes-extended/pam/libpam_1.1.5.bbappend delete mode 100644 recipes-extended/pam/libpam_1.1.6.bbappend create mode 100644 recipes-extended/psmisc/psmisc_22.16.bbappend delete mode 100644 recipes-extended/psmisc/psmisc_22.19.bbappend create mode 100644 recipes-extended/sudo/sudo_1.8.4p4.bbappend delete mode 100644 recipes-extended/sudo/sudo_1.8.5p2.bbappend diff --git a/recipes-connectivity/openssh/openssh_5.9p1.bbappend b/recipes-connectivity/openssh/openssh_5.9p1.bbappend new file mode 100644 index 0000000..103a6ac --- /dev/null +++ b/recipes-connectivity/openssh/openssh_5.9p1.bbappend @@ -0,0 +1,7 @@ +PR .= ".2" + +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" + +EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" diff --git a/recipes-connectivity/openssh/openssh_6.0p1.bbappend b/recipes-connectivity/openssh/openssh_6.0p1.bbappend deleted file mode 100644 index 103a6ac..0000000 --- a/recipes-connectivity/openssh/openssh_6.0p1.bbappend +++ /dev/null @@ -1,7 +0,0 @@ -PR .= ".2" - -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" - -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" diff --git a/recipes-connectivity/openssl/openssl_1.0.0i.bbappend b/recipes-connectivity/openssl/openssl_1.0.0i.bbappend new file mode 100644 index 0000000..388bdbf --- /dev/null +++ b/recipes-connectivity/openssl/openssl_1.0.0i.bbappend @@ -0,0 +1,3 @@ +PR .= ".1" + +CFLAG += " -Wa,--noexecstack" diff --git a/recipes-connectivity/openssl/openssl_1.0.0j.bbappend b/recipes-connectivity/openssl/openssl_1.0.0j.bbappend deleted file mode 100644 index 388bdbf..0000000 --- a/recipes-connectivity/openssl/openssl_1.0.0j.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -PR .= ".1" - -CFLAG += " -Wa,--noexecstack" diff --git a/recipes-core/dbus/dbus_1.4.16.bbappend b/recipes-core/dbus/dbus_1.4.16.bbappend new file mode 100644 index 0000000..70be093 --- /dev/null +++ b/recipes-core/dbus/dbus_1.4.16.bbappend @@ -0,0 +1,5 @@ +PR .= ".1" + +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" + +EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--enable-selinux', '--disable-selinux', d)}" 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 70be093..0000000 --- a/recipes-core/dbus/dbus_1.5.12.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -PR .= ".1" - -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" - -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--enable-selinux', '--disable-selinux', d)}" diff --git a/recipes-core/glib-2.0/glib-2.0_2.30.3.bbappend b/recipes-core/glib-2.0/glib-2.0_2.30.3.bbappend new file mode 100644 index 0000000..396feae --- /dev/null +++ b/recipes-core/glib-2.0/glib-2.0_2.30.3.bbappend @@ -0,0 +1,5 @@ +PR .= ".1" + +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" + +EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" diff --git a/recipes-core/glib-2.0/glib-2.0_2.32.4.bbappend b/recipes-core/glib-2.0/glib-2.0_2.32.4.bbappend deleted file mode 100644 index 396feae..0000000 --- a/recipes-core/glib-2.0/glib-2.0_2.32.4.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -PR .= ".1" - -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" - -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" diff --git a/recipes-core/util-linux/util-linux_2.21.2.bbappend b/recipes-core/util-linux/util-linux_2.21.2.bbappend deleted file mode 100644 index b9a09b5..0000000 --- a/recipes-core/util-linux/util-linux_2.21.2.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -PR .= ".1" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://util-linux-selinux.patch \ - " -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" - -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" - diff --git a/recipes-core/util-linux/util-linux_2.21.bbappend b/recipes-core/util-linux/util-linux_2.21.bbappend new file mode 100644 index 0000000..b9a09b5 --- /dev/null +++ b/recipes-core/util-linux/util-linux_2.21.bbappend @@ -0,0 +1,10 @@ +PR .= ".1" + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://util-linux-selinux.patch \ + " +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" + +EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" + diff --git a/recipes-devtools/rpm/rpm_5.4.0.bbappend b/recipes-devtools/rpm/rpm_5.4.0.bbappend new file mode 100644 index 0000000..2959fe8 --- /dev/null +++ b/recipes-devtools/rpm/rpm_5.4.0.bbappend @@ -0,0 +1,14 @@ +PR .= ".2" + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://rpm-fix-build-bug.patch \ + " + +FILES_${PN} += "${libdir}/rpm/bin/spooktool \ + ${libdir}/rpm/bin/semodule \ + " + +# Fix incorrect dependency in upstream version +PACKAGECONFIG[selinux] = "${WITH_SELINUX},${WITHOUT_SELINUX},libsemanage," +PACKAGECONFIG_append = " ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" diff --git a/recipes-devtools/rpm/rpm_5.4.9.bbappend b/recipes-devtools/rpm/rpm_5.4.9.bbappend deleted file mode 100644 index 2959fe8..0000000 --- a/recipes-devtools/rpm/rpm_5.4.9.bbappend +++ /dev/null @@ -1,14 +0,0 @@ -PR .= ".2" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://rpm-fix-build-bug.patch \ - " - -FILES_${PN} += "${libdir}/rpm/bin/spooktool \ - ${libdir}/rpm/bin/semodule \ - " - -# Fix incorrect dependency in upstream version -PACKAGECONFIG[selinux] = "${WITH_SELINUX},${WITHOUT_SELINUX},libsemanage," -PACKAGECONFIG_append = " ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" diff --git a/recipes-extended/lsof/lsof_4.85.bbappend b/recipes-extended/lsof/lsof_4.85.bbappend new file mode 100644 index 0000000..5b12125 --- /dev/null +++ b/recipes-extended/lsof/lsof_4.85.bbappend @@ -0,0 +1,14 @@ +PR .= ".1" + +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" + +do_configure_prepend () { + export LINUX_HASSELINUX="${@base_contains('DISTRO_FEATURES', 'selinux', 'Y', 'N', d)}" + export LSOF_CFGF="${CFLAGS}" + export LSOF_CFGL="${LDFLAGS}" + export LSOF_CC="${BUILD_CC}" +} + +do_compile () { + oe_runmake 'CC=${CC}' 'DEBUG=' +} diff --git a/recipes-extended/lsof/lsof_4.86.bbappend b/recipes-extended/lsof/lsof_4.86.bbappend deleted file mode 100644 index 5b12125..0000000 --- a/recipes-extended/lsof/lsof_4.86.bbappend +++ /dev/null @@ -1,14 +0,0 @@ -PR .= ".1" - -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" - -do_configure_prepend () { - export LINUX_HASSELINUX="${@base_contains('DISTRO_FEATURES', 'selinux', 'Y', 'N', d)}" - export LSOF_CFGF="${CFLAGS}" - export LSOF_CFGL="${LDFLAGS}" - export LSOF_CC="${BUILD_CC}" -} - -do_compile () { - oe_runmake 'CC=${CC}' 'DEBUG=' -} diff --git a/recipes-extended/pam/libpam_1.1.5.bbappend b/recipes-extended/pam/libpam_1.1.5.bbappend new file mode 100644 index 0000000..f78551f --- /dev/null +++ b/recipes-extended/pam/libpam_1.1.5.bbappend @@ -0,0 +1,12 @@ +FILESPATH_append := ":${@base_set_filespath(['${THISDIR}/${PN}'], d)}" + +SRC_URI += "file://sepermit-add-DESTDIR-prefix.patch" + +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" + +RDEPENDS_${PN}-runtime += "${@base_contains('DISTRO_FEATURES', 'selinux', 'pam-plugin-selinux', '', d)}" + +EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '', '--disable-selinux', d)}" + +PR .= ".3" + diff --git a/recipes-extended/pam/libpam_1.1.6.bbappend b/recipes-extended/pam/libpam_1.1.6.bbappend deleted file mode 100644 index 678dc91..0000000 --- a/recipes-extended/pam/libpam_1.1.6.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -#FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -FILESPATH_append := ":${@base_set_filespath(['${THISDIR}/${PN}'], d)}" - -SRC_URI += "file://sepermit-add-DESTDIR-prefix.patch" - -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" - -RDEPENDS_${PN}-runtime += "${@base_contains('DISTRO_FEATURES', 'selinux', 'pam-plugin-selinux', '', d)}" - -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '', '--disable-selinux', d)}" - -PR .= ".3" - diff --git a/recipes-extended/psmisc/psmisc_22.16.bbappend b/recipes-extended/psmisc/psmisc_22.16.bbappend new file mode 100644 index 0000000..aa6b6cb --- /dev/null +++ b/recipes-extended/psmisc/psmisc_22.16.bbappend @@ -0,0 +1,6 @@ +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" + +EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" + +PR .= ".1" + diff --git a/recipes-extended/psmisc/psmisc_22.19.bbappend b/recipes-extended/psmisc/psmisc_22.19.bbappend deleted file mode 100644 index aa6b6cb..0000000 --- a/recipes-extended/psmisc/psmisc_22.19.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" - -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" - -PR .= ".1" - diff --git a/recipes-extended/sudo/sudo_1.8.4p4.bbappend b/recipes-extended/sudo/sudo_1.8.4p4.bbappend new file mode 100644 index 0000000..396feae --- /dev/null +++ b/recipes-extended/sudo/sudo_1.8.4p4.bbappend @@ -0,0 +1,5 @@ +PR .= ".1" + +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" + +EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" 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 396feae..0000000 --- a/recipes-extended/sudo/sudo_1.8.5p2.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -PR .= ".1" - -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" - -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" -- cgit v1.2.3-54-g00ecf