Merge bk://oe-devel@oe-devel.bkbits.net/packages

into t.(none):/home/OE/speedracer/packages

2004/11/24 18:30:45-06:00 kergoth.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:packages
into hyperion.kergoth.com:/home/kergoth/code/packages

2004/11/24 19:21:13-06:00 ti.com!kergoth
Add GNU cpio.

2004/11/24 19:09:52-06:00 ti.com!kergoth
Correct the libapt-pkg and libapt-inst handling.

BKrev: 41a5338baW2LdBBSrAnA2B16r0iVVw

5 files changed, 123 insertions, 0 deletions

diff --git a/apt/apt-package.inc b/apt/apt-package.inc
index e69de29bb2..2ebaa7f2e3 100644
--- a/apt/apt-package.inc
+++ b/apt/apt-package.inc
@@ -0,0 +1,99 @@
+apt-manpages="doc/apt-cache.8 \
+	      doc/apt-cdrom.8 \
+	      doc/apt-config.8 \
+	      doc/apt-get.8 \
+	      doc/apt.8 \
+	      doc/apt.conf.5 \
+	      doc/apt_preferences.5 \
+	      doc/fr/apt-cache.fr.8 \
+	      doc/fr/apt-cdrom.fr.8 \
+	      doc/fr/apt-config.fr.8 \
+	      doc/fr/apt-get.fr.8 \
+	      doc/fr/apt.conf.fr.5 \
+	      doc/fr/apt_preferences.fr.5 \
+	      doc/fr/sources.list.fr.5 \
+	      doc/es/apt.es.8 \
+	      doc/es/apt-cache.es.8 \
+	      doc/es/apt-cdrom.es.8 \
+	      doc/es/apt-config.es.8 \
+	      doc/es/apt-get.es.8 \
+	      doc/es/apt.conf.es.5 \
+	      doc/es/apt_preferences.es.5 \
+	      doc/es/sources.list.es.5 \
+	      doc/pt_BR/apt_preferences.pt_BR.5 \
+	      doc/ja/apt-cache.ja.8 \
+	      doc/ja/apt-cdrom.ja.8 \
+	      doc/ja/apt-get.ja.8 \
+	      doc/ja/apt.conf.ja.5 \
+	      doc/sources.list.5"
+apt-utils-manpages="doc/apt-extracttemplates.1 \
+		    doc/apt-sortpkgs.1 \
+		    doc/fr/apt-extracttemplates.fr.1 \
+		    doc/fr/apt-sortpkgs.fr.1"
+#		    doc/fr/apt-ftparchive.fr.1
+#		    doc/apt-ftparchive.1
+
+def get_files_apt_doc(d, oe, manpages):
+	import re
+	manpages = re.sub(r'\bdoc/(\S+)/(\S+)\.\1\.(.)\b', r'${mandir}/\1/man\3/\2.\3', manpages)
+	manpages = re.sub(r'\bdoc/(\S+)\.(.)\b', r'${mandir}/man\3/\1.\3', manpages)
+	return manpages
+
+def get_commands_apt_doc(d, oe, manpages):
+	import os
+	s = list()
+	__dir_cache__ = list()
+	for m in manpages.split():
+		dest = get_files_apt_doc(d, oe, m)
+		dir = os.path.dirname(dest)
+		if not dir in __dir_cache__:
+			s.append("install -d ${D}/%s" % dir)
+			__dir_cache__.append(dir)
+		s.append("install -m 0644 %s ${D}/%s" % (m, dest))
+	return "\n".join(s)
+
+PACKAGES += "${PN}-utils ${PN}-utils-doc"
+FILES_${PN} = "${bindir}/apt-cdrom ${bindir}/apt-get \
+	       ${bindir}/apt-config ${bindir}/apt-cache \
+	       ${libdir}/apt ${libdir}/libapt*.so.* \
+	       ${localstatedir} ${sysconfdir} \
+	       ${libdir}/dpkg"
+FILES_${PN}-utils = "${bindir}/apt-sortpkgs ${bindir}/apt-extracttemplates"
+FILES_${PN}-doc = "${@get_files_apt_doc(d, oe, oe.data.getVar('apt-manpages', d, 1))} \
+		   ${datadir}/doc/apt"
+FILES_${PN}-utils-doc = "${@get_files_apt_doc(d, oe, oe.data.getVar('apt-utils-manpages', d, 1))}"
+FILES_${PN}-dev = "${libdir}/libapt*.so"
+
+do_install () {
+	${@get_commands_apt_doc(d, oe, oe.data.getVar('apt-manpages', d, 1))}
+	${@get_commands_apt_doc(d, oe, oe.data.getVar('apt-utils-manpages', d, 1))}
+	install -d ${D}/${bindir}
+	install -m 0755 bin/apt-cdrom ${D}/${bindir}/
+	install -m 0755 bin/apt-get ${D}/${bindir}/
+	install -m 0755 bin/apt-config ${D}/${bindir}/
+	install -m 0755 bin/apt-cache ${D}/${bindir}/
+
+	install -m 0755 bin/apt-sortpkgs ${D}/${bindir}/
+	install -m 0755 bin/apt-extracttemplates ${D}/${bindir}/
+
+	oe_libinstall -so -C bin libapt-pkg--6 ${D}/${libdir}/
+	ln -sf libapt-pkg--6.so ${D}/${libdir}/libapt-pkg.so
+	oe_libinstall -so -C bin libapt-inst--6 ${D}/${libdir}/
+	ln -sf libapt-inst--6.so ${D}/${libdir}/libapt-inst.so
+
+	install -d ${D}/${libdir}/apt/methods
+	install -m 0755 bin/methods/* ${D}/${libdir}/apt/methods/
+
+	install -d ${D}/${libdir}/dpkg/methods/apt
+	install -m 0644 dselect/desc.apt ${D}/${libdir}/dpkg/methods/apt/ 
+	install -m 0644 dselect/names ${D}/${libdir}/dpkg/methods/apt/ 
+	install -m 0755 dselect/install ${D}/${libdir}/dpkg/methods/apt/ 
+	install -m 0755 dselect/setup ${D}/${libdir}/dpkg/methods/apt/ 
+	install -m 0755 dselect/update ${D}/${libdir}/dpkg/methods/apt/ 
+
+	install -d ${D}/${sysconfdir}/apt
+	install -d ${D}/${localstatedir}/lib/apt/lists/partial
+	install -d ${D}/${localstatedir}/cache/apt/archives/partial
+	install -d ${D}/${datadir}/doc/apt/examples
+	install -m 0644 doc/examples/* ${D}/${datadir}/doc/apt/examples/
+}
diff --git a/apt/apt_0.5.27.oe b/apt/apt_0.5.27.oe
index e69de29bb2..3b3a41774e 100644
--- a/apt/apt_0.5.27.oe
+++ b/apt/apt_0.5.27.oe
@@ -0,0 +1,13 @@
+include apt.inc
+
+PR = "r1"
+SRC_URI += "file://autofoo.patch;patch=1"
+
+inherit autotools gettext
+
+include apt-package.inc
+
+apt-manpages += "doc/vendors.list.5 \
+		 doc/fr/vendors.list.fr.5 \
+		 doc/es/vendors.list.es.5 \
+		 doc/de/apt.de.8"
diff --git a/apt/apt_0.6.25.oe b/apt/apt_0.6.25.oe
index e69de29bb2..ac50771e92 100644
--- a/apt/apt_0.6.25.oe
+++ b/apt/apt_0.6.25.oe
@@ -0,0 +1,11 @@
+include apt.inc
+
+PR = "r1"
+SRC_URI += "file://autofoo.patch;patch=1"
+
+inherit autotools gettext
+
+include apt-package.inc
+
+FILES_${PN} += "${bindir}/apt-key"
+apt-manpages += "doc/apt-key.8"
diff --git a/cpio/cpio_2.5.oe b/cpio/cpio_2.5.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/cpio/cpio_2.5.oe
diff --git a/cpio/files/install.patch b/cpio/files/install.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/cpio/files/install.patch