tar: merge tar.inc into tar recipe
PATCH 1/2 tar: merge tar.inc into tar recipe
There's only one user of tar.inc (meta-gplv2 has its own copy), so merge the .inc file into the tar recipe.
Signed-off-by Andre McCurdy <[email protected]>
--- meta/recipes-extended/tar/tar.inc | 52 -------------------------- meta/recipes-extended/tar/tar_1.30.bb | 70 ++++++++++++++++++++++++++++++----- 2 files changed, 60 insertions(+), 62 deletions(-) delete mode 100644 meta/recipes-extended/tar/tar.inc
meta/recipes-extended/tar/tar.inc deleted +0 -52
@@ -1,52 +0,0 @@ -SUMMARY = "GNU file archiving program" -DESCRIPTION = "GNU tar saves many files together into a single tape \ -or disk archive, and can restore individual files from the archive." -HOMEPAGE = "http://www.gnu.org/software/tar/" -SECTION = "base" - -SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2" - -inherit autotools gettext texinfo - -EXTRA_OECONF += "DEFAULT_RMT_DIR=${base_sbindir}" - -# Let aclocal use the relative path for the m4 file rather than the -# absolute since tar has a lot of m4 files, otherwise there might -# be an "Argument list too long" error when it is built in a long/deep -# directory. -acpaths = "-I ./m4" - -do_install () { - autotools_do_install - ln -s tar ${D}${bindir}/gtar -} - -do_install_append_class-target() { - if [ "${base_bindir}" != "${bindir}" ]; then - install -d ${D}${base_bindir} - mv ${D}${bindir}/tar ${D}${base_bindir}/tar - mv ${D}${bindir}/gtar ${D}${base_bindir}/gtar - rmdir ${D}${bindir}/ - fi -} - -PACKAGES =+ "${PN}-rmt" - -FILES_${PN}-rmt = "${base_sbindir}/rmt*" - -inherit update-alternatives - -ALTERNATIVE_PRIORITY = "100" - -ALTERNATIVE_${PN} = "tar" -ALTERNATIVE_${PN}-rmt = "rmt" -ALTERNATIVE_${PN}_class-nativesdk = "" -ALTERNATIVE_${PN}-rmt_class-nativesdk = "" - -ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar" -ALTERNATIVE_LINK_NAME[rmt] = "${base_sbindir}/rmt" - -PROVIDES_append_class-native = " tar-replacement-native" -NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" - -BBCLASSEXTEND = "native nativesdk"
meta/recipes-extended/tar/tar_1.30.bb +60 -10
78 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH 2/2 tar: control acl PACKAGECONFIG based on acl distro feature
Signed-off-by Andre McCurdy <[email protected]>
--- meta/recipes-extended/tar/tar_1.30.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-extended/tar/tar_1.30.bb +2 -0
@@ -17,6 +17,8 @@ SRC_URI[sha256sum] = "87592b86cb037c554375f5868bdd3cc57748aef38d6cb741c81065f0be inherit autotools gettext texinfo PACKAGECONFIG ??= "" +PACKAGECONFIG_append_class-target = " ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)}" + PACKAGECONFIG[acl] = "--with-posix-acls,--without-posix-acls,acl" EXTRA_OECONF += "DEFAULT_RMT_DIR=${base_sbindir}"
Signature · 1 line
1.9.1