Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/23 19:29:51-06:00 ti.com!kergoth
Rename gnupg-devel to gnupg2, since this development branch has the binaries
postfixed that way, so is clearly for the upcoming 2.x stable release.  Also
change libexecdir from /usr/libexec to /usr/libexec/gnupg2, as it was
resulting in the gnupg binaries ending up in the root of /usr/libexec, rather
than by packagename.

2005/02/23 19:24:52-06:00 ti.com!kergoth
Fix the ipk rootfs/image classes to use ${libdir}/ipkg, now that ipkg does so as well.

2005/02/23 19:22:38-06:00 ti.com!kergoth
Add a development version of gnupg (version 1.9.15) as gnupg-devel.
Note that the 'gpgsm' and 'scdaemon' binaries are not currently being
built, due to the additional dependencies they introduce.  If you need
them, let me know.
One issue that needs to be fixed is that the gnupg-devel build needs to
prefix or postfix its binaries, or conflict with 'gnupg', to ensure
they don't step on one another's toes.

2005/02/23 19:18:34-06:00 ti.com!kergoth
Add libgpg-error 1.0 (required by gnupg 0.9.15) and make the libgpg-error .bb's inherit binconfig.

2005/02/23 19:17:35-06:00 ti.com!kergoth
Add libgcrypt 1.2.1 and make the libgcrypt .bb's inherit binconfig.

2005/02/23 19:16:20-06:00 ti.com!kergoth
Add libassuan 0.6.9 (required by gnupg 0.9.15) and make the libassuan .bb's inherit binconfig.

BKrev: 421d3078taXhU4QcW7mi0rDTzgYsgA

14 files changed, 204 insertions, 3 deletions

diff --git a/classes/image_ipk.bbclass b/classes/image_ipk.bbclass
index f2a1180e97..1681032e6f 100644
--- a/classes/image_ipk.bbclass
+++ b/classes/image_ipk.bbclass
@@ -36,7 +36,7 @@ fakeroot do_rootfs () {
 
 	insert_feed_uris	
 
-	rm ${IMAGE_ROOTFS}/usr/lib/ipkg/lists/oe
+	rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/lists/oe
 	
 	${IMAGE_PREPROCESS_COMMAND}
 		
diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 9897c1d901..e42704b5ae 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -57,12 +57,12 @@ real_do_rootfs () {
 	mkdir -p ${IMAGE_ROOTFS}/etc/ipkg/
 	grep "^arch" ${T}/ipkg.conf >${IMAGE_ROOTFS}/etc/ipkg/arch.conf
 
-	for i in ${IMAGE_ROOTFS}/usr/lib/ipkg/info/*.preinst; do
+	for i in ${IMAGE_ROOTFS}${libdir}/ipkg/info/*.preinst; do
 		if [ -f $i ] && ! sh $i; then
 			ipkg-cl ${IPKG_ARGS} flag unpacked `basename $i .preinst`
 		fi
 	done
-	for i in ${IMAGE_ROOTFS}/usr/lib/ipkg/info/*.postinst; do
+	for i in ${IMAGE_ROOTFS}${libdir}/ipkg/info/*.postinst; do
 		if [ -f $i ] && ! sh $i configure; then
 			ipkg-cl ${IPKG_ARGS} flag unpacked `basename $i .postinst`
 		fi
diff --git a/packages/gnupg/gnupg.inc b/packages/gnupg/gnupg.inc
index e69de29bb2..717d76fdaa 100644
--- a/packages/gnupg/gnupg.inc
+++ b/packages/gnupg/gnupg.inc
@@ -0,0 +1,73 @@
+SECTION = "console/utils"
+DESCRIPTION = "gnupg - GNU privacy guard"
+HOMEPAGE = "http://www.gnupg.org/"
+LICENSE = "GPLv2"
+MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
+DEPENDS = "zlib bzip2"
+
+inherit autotools gettext
+
+MIRRORS_prepend () {
+ftp://ftp.gnupg.org/gcrypt	http://mirrors.rootmode.com/ftp.gnupg.org
+}
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${PV}.tar.bz2"
+S = "${WORKDIR}/gnupg-${PV}"
+
+#   --with-egd-socket=NAME  use NAME for the EGD socket
+#   --with-photo-viewer=FIXED_VIEWER  set a fixed photo ID viewer
+#   --with-included-zlib    use the zlib code included here
+#   --with-capabilities     use linux capabilities default=no
+#   --with-mailprog=NAME    use "NAME -t" for mail transport
+#   --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
+#   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
+#   --with-included-gettext use the GNU gettext library included here
+#   --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
+#   --without-libintl-prefix     don't search for libintl in includedir and libdir
+#   --with-included-regex   use the included GNU regex library
+#   --with-zlib=DIR         use libz in DIR
+#   --with-bzip2=DIR        look for bzip2 in DIR
+#   --enable-static-rnd=egd|unix|linux|auto
+#   --disable-dev-random    disable the use of dev random
+#   --disable-asm           do not use assembler modules
+#   --enable-m-guard        enable memory guard facility
+#   --enable-selinux-support
+#                           enable SELinux support
+#   --disable-card-support  disable OpenPGP card support
+#   --disable-gnupg-iconv   disable the new iconv code
+#   --enable-backsigs       enable the experimental backsigs code
+#   --enable-minimal        build the smallest gpg binary possible
+#   --disable-rsa           disable the RSA public key algorithm
+#   --disable-idea          disable the IDEA cipher
+#   --disable-cast5         disable the CAST5 cipher
+#   --disable-blowfish      disable the BLOWFISH cipher
+#   --disable-aes           disable the AES, AES192, and AES256 ciphers
+#   --disable-twofish       disable the TWOFISH cipher
+#   --disable-sha256        disable the SHA-256 digest
+#   --disable-sha512        disable the SHA-384 and SHA-512 digests
+#   --disable-bzip2         disable the BZIP2 compression algorithm
+#   --disable-exec          disable all external program execution
+#   --disable-photo-viewers disable photo ID viewers
+#   --disable-keyserver-helpers  disable all external keyserver support
+#   --disable-ldap          disable LDAP keyserver interface
+#   --disable-hkp           disable HKP keyserver interface
+#   --disable-http          disable HTTP key fetching interface
+#   --disable-finger        disable Finger key fetching interface
+#   --disable-mailto        disable email keyserver interface
+#   --disable-keyserver-path disable the exec-path option for keyserver helpers
+#   --enable-key-cache=SIZE Set key cache to SIZE (default 4096)
+#   --disable-largefile     omit support for large files
+#   --disable-dns-srv       disable the use of DNS SRV in HKP and HTTP
+#   --disable-nls           do not use Native Language Support
+#   --disable-regex         do not handle regular expressions in trust sigs
+
+EXTRA_OECONF = "--disable-ldap \
+		--with-zlib=${STAGING_LIBDIR}/.. \
+		--with-bzip2=${STAGING_LIBDIR}/.. \
+		--disable-selinux-support"
+
+do_install () {
+	autotools_do_install
+	install -d ${D}${docdir}/${PN}
+	mv ${D}${datadir}/${PN}/* ${D}/${docdir}/${PN}/ || :
+	mv ${D}${prefix}/doc/* ${D}/${docdir}/${PN}/ || :
+}
diff --git a/packages/gnupg/gnupg2.inc b/packages/gnupg/gnupg2.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnupg/gnupg2.inc
diff --git a/packages/gnupg/gnupg2_1.9.15.bb b/packages/gnupg/gnupg2_1.9.15.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnupg/gnupg2_1.9.15.bb
diff --git a/packages/libassuan/libassuan_0.6.7.bb b/packages/libassuan/libassuan_0.6.7.bb
index e69de29bb2..5682022acc 100644
--- a/packages/libassuan/libassuan_0.6.7.bb
+++ b/packages/libassuan/libassuan_0.6.7.bb
@@ -0,0 +1,17 @@
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-${PV}.tar.gz"
+
+inherit autotools binconfig
+
+do_stage() {
+	autotools_stage_includes
+	
+	install -d ${STAGING_LIBDIR}
+	oe_libinstall -C src -a libassuan ${STAGING_LIBDIR}
+
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 0644 src/libassuan.m4 ${STAGING_DATADIR}/aclocal/
+}
+
diff --git a/packages/libassuan/libassuan_0.6.9.bb b/packages/libassuan/libassuan_0.6.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libassuan/libassuan_0.6.9.bb
diff --git a/packages/libgcrypt/libgcrypt_1.1.91.bb b/packages/libgcrypt/libgcrypt_1.1.91.bb
index e69de29bb2..c4259eb0f3 100644
--- a/packages/libgcrypt/libgcrypt_1.1.91.bb
+++ b/packages/libgcrypt/libgcrypt_1.1.91.bb
@@ -0,0 +1,33 @@
+PR = "r3"
+DESCRIPTION = "A general purpose cryptographic library based on the code from GnuPG"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL LGPL FDL"
+DEPENDS = "libgpg-error"
+
+PACKAGES =+ "libgcrypt-pthread libgcrypt-pthread-dev"
+
+# move libgcrypt-config into -dev package
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${bindir}"
+FILES_libgcrypt-pthread = "${libdir}/libgcrypt-pthread.so.*"
+FILES_libgcrypt-pthread-dev = "${libdir}/libgcrypt-pthread.*"
+
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/libgcrypt-${PV}.tar.gz"
+
+inherit autotools binconfig
+
+EXTRA_OECONF = "--without-pth"
+
+do_stage() {
+	oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
+	oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
+	install -m 0755 src/libgcrypt-config ${STAGING_BINDIR}/
+
+	install -d ${STAGING_INCDIR}/
+	for X in gcrypt.h gcrypt-module.h
+	do
+		install -m 0644 src/${X} ${STAGING_INCDIR}/${X}
+	done
+
+}
diff --git a/packages/libgcrypt/libgcrypt_1.2.0.bb b/packages/libgcrypt/libgcrypt_1.2.0.bb
index e69de29bb2..d961e4f84a 100644
--- a/packages/libgcrypt/libgcrypt_1.2.0.bb
+++ b/packages/libgcrypt/libgcrypt_1.2.0.bb
@@ -0,0 +1,29 @@
+PR = "r2"
+DESCRIPTION = "A general purpose cryptographic library based on the code from GnuPG"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL LGPL FDL"
+DEPENDS = "libgpg-error"
+
+# move libgcrypt-config into -dev package
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${bindir}"
+
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz"
+
+inherit autotools binconfig
+
+EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
+
+do_stage() {
+	oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
+	oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
+	install -m 0755 src/libgcrypt-config ${STAGING_BINDIR}/
+
+	install -d ${STAGING_INCDIR}/
+	for X in gcrypt.h gcrypt-module.h
+	do
+		install -m 0644 src/${X} ${STAGING_INCDIR}/${X}
+	done
+
+}
diff --git a/packages/libgcrypt/libgcrypt_1.2.1.bb b/packages/libgcrypt/libgcrypt_1.2.1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libgcrypt/libgcrypt_1.2.1.bb
diff --git a/packages/libgpg-error/libgpg-error-1.0/pkgconfig.patch b/packages/libgpg-error/libgpg-error-1.0/pkgconfig.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libgpg-error/libgpg-error-1.0/pkgconfig.patch
diff --git a/packages/libgpg-error/libgpg-error_0.6.bb b/packages/libgpg-error/libgpg-error_0.6.bb
index e69de29bb2..fced6b7adc 100644
--- a/packages/libgpg-error/libgpg-error_0.6.bb
+++ b/packages/libgpg-error/libgpg-error_0.6.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "GPG-Error library"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL LGPL FDL"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/libgpg-error-${PV}.tar.gz"
+
+inherit autotools binconfig
+
+do_stage() {
+	oe_libinstall -so -C src libgpg-error ${STAGING_LIBDIR}
+	install -m 0755 src/gpg-error-config ${STAGING_BINDIR}/
+
+	install -d ${STAGING_INCDIR}/
+	for X in gpg-error.h
+	do
+		install -m 0644 src/${X} ${STAGING_INCDIR}/${X}
+	done
+
+}
diff --git a/packages/libgpg-error/libgpg-error_0.7.bb b/packages/libgpg-error/libgpg-error_0.7.bb
index e69de29bb2..c165044e83 100644
--- a/packages/libgpg-error/libgpg-error_0.7.bb
+++ b/packages/libgpg-error/libgpg-error_0.7.bb
@@ -0,0 +1,28 @@
+PR = "r4"
+DESCRIPTION = "GPG-Error library"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL LGPL FDL"
+
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/libgpg-error-${PV}.tar.gz \
+	   file://pkgconfig.patch;patch=1"
+
+# move libgpg-error-config into -dev package
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${bindir}"
+
+inherit autotools binconfig pkgconfig
+
+do_stage() {
+	oe_libinstall -a -so -C src libgpg-error ${STAGING_LIBDIR}
+	install -m 0755 src/gpg-error-config ${STAGING_BINDIR}/
+
+	install -d ${STAGING_INCDIR}/
+	for X in gpg-error.h
+	do
+		install -m 0644 ${S}/src/$X ${STAGING_INCDIR}/$X
+	done
+
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 0644 src/gpg-error.m4 ${STAGING_DATADIR}/aclocal/
+}
diff --git a/packages/libgpg-error/libgpg-error_1.0.bb b/packages/libgpg-error/libgpg-error_1.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libgpg-error/libgpg-error_1.0.bb