From 3746305f13f8b3f1c7982686fc6398ba248112a7 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Tue, 6 Jan 2015 11:25:01 +0100 Subject: move recipes-extended to base Change-Id: Iacc27a77e0688618bf6f932b9746e0090ae1b6b4 Signed-off-by: Ronan Le Martret --- .../ecryptfs-utils/ecryptfs-utils-extraconf.inc | 27 ++++ .../ecryptfs-utils/ecryptfs-utils.inc | 176 +++++++++++++++++++++ .../ecryptfs-utils/ecryptfs-utils_git.bb | 10 ++ .../ecryptfs-utils/ecryptfs-utils-extraconf.inc | 27 ---- .../ecryptfs-utils/ecryptfs-utils.inc | 176 --------------------- .../ecryptfs-utils/ecryptfs-utils_git.bb | 10 -- 6 files changed, 213 insertions(+), 213 deletions(-) create mode 100644 meta-tizen-common-base/recipes-extended/ecryptfs-utils/ecryptfs-utils-extraconf.inc create mode 100644 meta-tizen-common-base/recipes-extended/ecryptfs-utils/ecryptfs-utils.inc create mode 100644 meta-tizen-common-base/recipes-extended/ecryptfs-utils/ecryptfs-utils_git.bb delete mode 100644 meta-tizen-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils-extraconf.inc delete mode 100644 meta-tizen-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils.inc delete mode 100644 meta-tizen-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils_git.bb diff --git a/meta-tizen-common-base/recipes-extended/ecryptfs-utils/ecryptfs-utils-extraconf.inc b/meta-tizen-common-base/recipes-extended/ecryptfs-utils/ecryptfs-utils-extraconf.inc new file mode 100644 index 00000000..81507114 --- /dev/null +++ b/meta-tizen-common-base/recipes-extended/ecryptfs-utils/ecryptfs-utils-extraconf.inc @@ -0,0 +1,27 @@ +DEPENDS += "python" + +do_configure_prepend() { + # Remove unknown macro in configure.ac + sed -i 's@^AM_GLIB_GNU_GETTEXT@@' configure.ac +} + +do_compile_prepend() { + export HOST_SYS=${HOST_SYS} + export BUILD_SYS=${BUILD_SYS} + export STAGING_LIBDIR=${STAGING_LIBDIR} + export STAGING_INCDIR=${STAGING_INCDIR} +} + + +# Bypass a QA issue regarding symnlinks. +# A better solution would be to create a libecryptfs-python-dev package containing the symlinks. +INSANE_SKIP_libecryptfs-python = "dev-so" + +PACKAGES += " libecryptfs-dbg " +PACKAGES += " libecryptfs-python-dbg " + +FILES_${PN}-dbg += "/lib/security/.debug/pam_ecryptfs.so" + +FILES_libecryptfs-dbg += "/usr/lib/ecryptfs/.debug/libecryptfs_key_mod_passphrase.so" + +FILES_libecryptfs-python-dbg += "/usr/lib/python2.7/site-packages/ecryptfs-utils/.debug/_libecryptfs.so.0.0.0" diff --git a/meta-tizen-common-base/recipes-extended/ecryptfs-utils/ecryptfs-utils.inc b/meta-tizen-common-base/recipes-extended/ecryptfs-utils/ecryptfs-utils.inc new file mode 100644 index 00000000..23f95e01 --- /dev/null +++ b/meta-tizen-common-base/recipes-extended/ecryptfs-utils/ecryptfs-utils.inc @@ -0,0 +1,176 @@ +DESCRIPTION = "Userspace Utilities for ecryptfs" +HOMEPAGE = "http://nohomepage.org" +SECTION = "System/Libraries" +LICENSE = "GPL-2.0+" +PV = "104" + +SRC_URI = "" + +S = "${WORKDIR}/git" + +inherit manifest autotools-brokensep + +BBCLASSEXTEND = "" +PROVIDES = "" + +#PROVIDES by ecryptfs-utils + + +#PROVIDES by libecryptfs-python +PROVIDES += "libecryptfs-python" + + +#PROVIDES by libecryptfs +PROVIDES += "libecryptfs" + + +#PROVIDES by libecryptfs-dev +PROVIDES += "libecryptfs-dev" + + +RDEPENDS = "" +#RDEPENDS of libecryptfs-python (libecryptfs-python) +RDEPENDS_libecryptfs-python += "libecryptfs" + +#RDEPENDS of ecryptfs-utils (${PN}) +RDEPENDS_${PN} += "keyutils" +RDEPENDS_${PN} += "libecryptfs" +RDEPENDS_${PN} += "glibc" + +#RDEPENDS of libecryptfs-dev (libecryptfs-dev) +RDEPENDS_libecryptfs-dev += "libecryptfs" +RDEPENDS_libecryptfs-dev += "keyutils" + + +DEPENDS = "" +#DEPENDS of ecryptfs-utils +DEPENDS += "keyutils" +DEPENDS_append_class-native = " intltool-native" +DEPENDS_append_class-target = " intltool-native" +inherit pythonnative +DEPENDS_append_class-native = " fdupes-native" +DEPENDS_append_class-target = " fdupes-native" +inherit pkgconfig +DEPENDS += "glib-2.0" +DEPENDS += "nss" +DEPENDS += "libpam" + +do_prep() { + cd ${S} + chmod -Rf a+rX,u+w,g-w,o-w ${S} + #setup -q -n ecryptfs-utils-104 + cp ${S}/packaging/ecryptfs-utils.manifest . + + + +} +do_patch_append() { + bb.build.exec_func('do_prep', d) +} + +do_configure() { +} + +do_compile() { + cd ${S} + LANG=C + export LANG + unset DISPLAY + LD_AS_NEEDED=1; export LD_AS_NEEDED ; + + + autotools_do_configure + oe_runmake -j16 + + + + +} +EXTRA_OECONF += " --disable-openssl" + +do_install() { + export RPM_BUILD_ROOT=${D} + cd ${S} + LANG=C + export LANG + unset DISPLAY + rm -rf ${D} + mkdir -p ${D} + + rm -rf ${D} + + oe_runmake \ + DESTDIR=${D} \ + INSTALL_ROOT=${D} \ + BINDIR=${prefix}/bin \ + install + rm -f ${D}${infodir}/dir + find ${D} -regex ".*\.la$" | xargs rm -f -- + find ${D} -regex ".*\.a$" | xargs rm -f -- + + #find_lang ecryptfs-utils + + #fdupes ${D} + + + +} + +pkg_postinst_libecryptfs() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +pkg_postrm_libecryptfs() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" +PACKAGES += " libecryptfs " +PACKAGES += " ecryptfs-utils " +PACKAGES += " libecryptfs-python " +PACKAGES += " libecryptfs-dev " + +libecryptfs_files = "" +libecryptfs_files += "${prefix}/lib/libecryptfs.so.*" +libecryptfs_files += "${prefix}/lib/ecryptfs/*" +MANIFESTFILES_libecryptfs = "ecryptfs-utils.manifest" + +ecryptfs-utils_files = "" +ecryptfs-utils_files += "AUTHORS NEWS" +ecryptfs-utils_files += "${prefix}/bin/ecryptfs*" +ecryptfs-utils_files += "/sbin/mount.ecryptfs*" +ecryptfs-utils_files += "/sbin/umount.ecryptfs*" +ecryptfs-utils_files += "/lib/security/pam_ecryptfs.so" +ecryptfs-utils_files += "${mandir}/man1/*ecryptfs*" +ecryptfs-utils_files += "${mandir}/man7/*ecryptfs*" +ecryptfs-utils_files += "${mandir}/man8/*ecryptfs*" +ecryptfs-utils_files += "${prefix}/share/doc/ecryptfs-utils/*" +ecryptfs-utils_files += "${prefix}/share/ecryptfs-utils/*" +MANIFESTFILES_${PN} = "ecryptfs-utils.manifest" + +libecryptfs-python_files = "" +libecryptfs-python_files += "/usr/lib/python2.7/site-packages/ecryptfs-utils/*" +MANIFESTFILES_libecryptfs-python = "ecryptfs-utils.manifest" + +libecryptfs-dev_files = "" +libecryptfs-dev_files += "${prefix}/include/ecryptfs.h" +libecryptfs-dev_files += "${prefix}/lib/libecryptfs.so" +libecryptfs-dev_files += "${prefix}/lib/pkgconfig/libecryptfs.pc" +MANIFESTFILES_libecryptfs-dev = "ecryptfs-utils.manifest" + +FILES_libecryptfs = "${libecryptfs_files}" +FILES_${PN} = "${ecryptfs-utils_files}" +FILES_libecryptfs-python = "${libecryptfs-python_files}" +FILES_libecryptfs-dev = "${libecryptfs-dev_files}" + +PKG_libecryptfs= "libecryptfs" +PKG_ecryptfs-utils= "ecryptfs-utils" +PKG_libecryptfs-python= "libecryptfs-python" +PKG_libecryptfs-dev= "libecryptfs-dev" + +require ecryptfs-utils-extraconf.inc + diff --git a/meta-tizen-common-base/recipes-extended/ecryptfs-utils/ecryptfs-utils_git.bb b/meta-tizen-common-base/recipes-extended/ecryptfs-utils/ecryptfs-utils_git.bb new file mode 100644 index 00000000..0b566264 --- /dev/null +++ b/meta-tizen-common-base/recipes-extended/ecryptfs-utils/ecryptfs-utils_git.bb @@ -0,0 +1,10 @@ +require ecryptfs-utils.inc + +PRIORITY = "10" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/platform/upstream/ecryptfs-utils;tag=f496d10d2711cbb2b9d3f7600756487df383e737;nobranch=1" + +BBCLASSEXTEND += " native " + diff --git a/meta-tizen-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils-extraconf.inc b/meta-tizen-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils-extraconf.inc deleted file mode 100644 index 81507114..00000000 --- a/meta-tizen-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils-extraconf.inc +++ /dev/null @@ -1,27 +0,0 @@ -DEPENDS += "python" - -do_configure_prepend() { - # Remove unknown macro in configure.ac - sed -i 's@^AM_GLIB_GNU_GETTEXT@@' configure.ac -} - -do_compile_prepend() { - export HOST_SYS=${HOST_SYS} - export BUILD_SYS=${BUILD_SYS} - export STAGING_LIBDIR=${STAGING_LIBDIR} - export STAGING_INCDIR=${STAGING_INCDIR} -} - - -# Bypass a QA issue regarding symnlinks. -# A better solution would be to create a libecryptfs-python-dev package containing the symlinks. -INSANE_SKIP_libecryptfs-python = "dev-so" - -PACKAGES += " libecryptfs-dbg " -PACKAGES += " libecryptfs-python-dbg " - -FILES_${PN}-dbg += "/lib/security/.debug/pam_ecryptfs.so" - -FILES_libecryptfs-dbg += "/usr/lib/ecryptfs/.debug/libecryptfs_key_mod_passphrase.so" - -FILES_libecryptfs-python-dbg += "/usr/lib/python2.7/site-packages/ecryptfs-utils/.debug/_libecryptfs.so.0.0.0" diff --git a/meta-tizen-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils.inc b/meta-tizen-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils.inc deleted file mode 100644 index 23f95e01..00000000 --- a/meta-tizen-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils.inc +++ /dev/null @@ -1,176 +0,0 @@ -DESCRIPTION = "Userspace Utilities for ecryptfs" -HOMEPAGE = "http://nohomepage.org" -SECTION = "System/Libraries" -LICENSE = "GPL-2.0+" -PV = "104" - -SRC_URI = "" - -S = "${WORKDIR}/git" - -inherit manifest autotools-brokensep - -BBCLASSEXTEND = "" -PROVIDES = "" - -#PROVIDES by ecryptfs-utils - - -#PROVIDES by libecryptfs-python -PROVIDES += "libecryptfs-python" - - -#PROVIDES by libecryptfs -PROVIDES += "libecryptfs" - - -#PROVIDES by libecryptfs-dev -PROVIDES += "libecryptfs-dev" - - -RDEPENDS = "" -#RDEPENDS of libecryptfs-python (libecryptfs-python) -RDEPENDS_libecryptfs-python += "libecryptfs" - -#RDEPENDS of ecryptfs-utils (${PN}) -RDEPENDS_${PN} += "keyutils" -RDEPENDS_${PN} += "libecryptfs" -RDEPENDS_${PN} += "glibc" - -#RDEPENDS of libecryptfs-dev (libecryptfs-dev) -RDEPENDS_libecryptfs-dev += "libecryptfs" -RDEPENDS_libecryptfs-dev += "keyutils" - - -DEPENDS = "" -#DEPENDS of ecryptfs-utils -DEPENDS += "keyutils" -DEPENDS_append_class-native = " intltool-native" -DEPENDS_append_class-target = " intltool-native" -inherit pythonnative -DEPENDS_append_class-native = " fdupes-native" -DEPENDS_append_class-target = " fdupes-native" -inherit pkgconfig -DEPENDS += "glib-2.0" -DEPENDS += "nss" -DEPENDS += "libpam" - -do_prep() { - cd ${S} - chmod -Rf a+rX,u+w,g-w,o-w ${S} - #setup -q -n ecryptfs-utils-104 - cp ${S}/packaging/ecryptfs-utils.manifest . - - - -} -do_patch_append() { - bb.build.exec_func('do_prep', d) -} - -do_configure() { -} - -do_compile() { - cd ${S} - LANG=C - export LANG - unset DISPLAY - LD_AS_NEEDED=1; export LD_AS_NEEDED ; - - - autotools_do_configure - oe_runmake -j16 - - - - -} -EXTRA_OECONF += " --disable-openssl" - -do_install() { - export RPM_BUILD_ROOT=${D} - cd ${S} - LANG=C - export LANG - unset DISPLAY - rm -rf ${D} - mkdir -p ${D} - - rm -rf ${D} - - oe_runmake \ - DESTDIR=${D} \ - INSTALL_ROOT=${D} \ - BINDIR=${prefix}/bin \ - install - rm -f ${D}${infodir}/dir - find ${D} -regex ".*\.la$" | xargs rm -f -- - find ${D} -regex ".*\.a$" | xargs rm -f -- - - #find_lang ecryptfs-utils - - #fdupes ${D} - - - -} - -pkg_postinst_libecryptfs() { - #!/bin/sh -e - - [ "x$D" == "x" ] && ldconfig -} - -pkg_postrm_libecryptfs() { - #!/bin/sh -e - - [ "x$D" == "x" ] && ldconfig -} - -PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" -PACKAGES += " libecryptfs " -PACKAGES += " ecryptfs-utils " -PACKAGES += " libecryptfs-python " -PACKAGES += " libecryptfs-dev " - -libecryptfs_files = "" -libecryptfs_files += "${prefix}/lib/libecryptfs.so.*" -libecryptfs_files += "${prefix}/lib/ecryptfs/*" -MANIFESTFILES_libecryptfs = "ecryptfs-utils.manifest" - -ecryptfs-utils_files = "" -ecryptfs-utils_files += "AUTHORS NEWS" -ecryptfs-utils_files += "${prefix}/bin/ecryptfs*" -ecryptfs-utils_files += "/sbin/mount.ecryptfs*" -ecryptfs-utils_files += "/sbin/umount.ecryptfs*" -ecryptfs-utils_files += "/lib/security/pam_ecryptfs.so" -ecryptfs-utils_files += "${mandir}/man1/*ecryptfs*" -ecryptfs-utils_files += "${mandir}/man7/*ecryptfs*" -ecryptfs-utils_files += "${mandir}/man8/*ecryptfs*" -ecryptfs-utils_files += "${prefix}/share/doc/ecryptfs-utils/*" -ecryptfs-utils_files += "${prefix}/share/ecryptfs-utils/*" -MANIFESTFILES_${PN} = "ecryptfs-utils.manifest" - -libecryptfs-python_files = "" -libecryptfs-python_files += "/usr/lib/python2.7/site-packages/ecryptfs-utils/*" -MANIFESTFILES_libecryptfs-python = "ecryptfs-utils.manifest" - -libecryptfs-dev_files = "" -libecryptfs-dev_files += "${prefix}/include/ecryptfs.h" -libecryptfs-dev_files += "${prefix}/lib/libecryptfs.so" -libecryptfs-dev_files += "${prefix}/lib/pkgconfig/libecryptfs.pc" -MANIFESTFILES_libecryptfs-dev = "ecryptfs-utils.manifest" - -FILES_libecryptfs = "${libecryptfs_files}" -FILES_${PN} = "${ecryptfs-utils_files}" -FILES_libecryptfs-python = "${libecryptfs-python_files}" -FILES_libecryptfs-dev = "${libecryptfs-dev_files}" - -PKG_libecryptfs= "libecryptfs" -PKG_ecryptfs-utils= "ecryptfs-utils" -PKG_libecryptfs-python= "libecryptfs-python" -PKG_libecryptfs-dev= "libecryptfs-dev" - -require ecryptfs-utils-extraconf.inc - diff --git a/meta-tizen-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils_git.bb b/meta-tizen-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils_git.bb deleted file mode 100644 index 0b566264..00000000 --- a/meta-tizen-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils_git.bb +++ /dev/null @@ -1,10 +0,0 @@ -require ecryptfs-utils.inc - -PRIORITY = "10" - -LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" - -SRC_URI += "git://review.tizen.org/platform/upstream/ecryptfs-utils;tag=f496d10d2711cbb2b9d3f7600756487df383e737;nobranch=1" - -BBCLASSEXTEND += " native " - -- cgit v1.2.3