merge of '603b2d0c7e4ad80e5779bd3bbdb822331cc0ea2b'

     and '6ab53da82d157971966f5a17d0c29d54df22cac9'

3 files changed, 25 insertions, 27 deletions

diff --git a/packages/tar/tar/.mtn2git_empty b/packages/tar/tar/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/tar/tar/.mtn2git_empty
+++ /dev/null
diff --git a/packages/tar/tar/tar-native_1.13.25.oe b/packages/tar/tar/tar-native_1.13.25.oe
deleted file mode 100644
index 07771156ba..0000000000
--- a/packages/tar/tar/tar-native_1.13.25.oe
+++ /dev/null
@@ -1,27 +0,0 @@
-SECTION = "base"
-DESCRIPTION = "This version of GNU tar is only used for compatibility \
-reasons, where an old ipkg (e.g. ipkg 0.99.84) has to extract and \
-install *.ipk files created with OpenEmbedded."
-LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-
-SRC_URI = "ftp://alpha.gnu.org/gnu/tar/tar-${PV}.tar.gz"
-
-inherit autotools
-inherit native
-
-S = "${WORKDIR}/tar-${PV}"
-
-OEDEBUG = 2
-
-do_configure() {
-	oe_runconf
-}
-
-do_stage() {
-	install -m 755 src/tar ${STAGING_BINDIR}
-}
-
-do_install() {
-	true
-}
diff --git a/packages/tar/tar_1.18.bb b/packages/tar/tar_1.18.bb
new file mode 100644
index 0000000000..701c0b77bf
--- /dev/null
+++ b/packages/tar/tar_1.18.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "GNU tar saves many files together into a single tape \
+or disk archive, and can restore individual files from the archive."
+SECTION = "base"
+LICENSE = "GPLv3"
+
+SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2"
+
+inherit autotools
+
+do_install () {
+	autotools_do_install
+	install -d ${D}${base_bindir}
+	mv ${D}${bindir}/tar ${D}${base_bindir}/tar.${PN}
+	mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN}
+}
+
+pkg_postinst_${PN} () {
+	update-alternatives --install ${base_bindir}/tar tar tar.${PN} 100
+	update-alternatives --install ${libexecdir}/rmt rmt rmt.${PN} 100
+}
+
+pkg_prerm_${PN} () {
+	update-alternatives --remove tar tar.${PN}
+	update-alternatives --remove rmt rmt.${PN}
+}