[oe-commits] org.oe.dev gnutls: simplified recipes, dropped version older then 1.4.4

hrw commit openembedded-commits at lists.openembedded.org
Tue Dec 12 17:10:50 UTC 2006


gnutls: simplified recipes, dropped version older then 1.4.4
1.6.0 need one new library package

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 26ab4051ec6ee9153656e1ea57a1ea5c53aad6ce
ViewMTN: http://monotone.openembedded.org/revision.psp?id=26ab4051ec6ee9153656e1ea57a1ea5c53aad6ce
Files:
1
packages/gnutls/gnutls-1.0.23
packages/gnutls/gnutls-1.0.23/export-symbols.patch
packages/gnutls/gnutls-1.0.23/gnutls-openssl.patch
packages/gnutls/gnutls-1.0.25
packages/gnutls/gnutls-1.0.25/export-symbols.patch
packages/gnutls/gnutls-1.0.25/gnutls-openssl.patch
packages/gnutls/gnutls-1.3.5
packages/gnutls/gnutls-1.3.5/gnutls-texinfo-euro.patch
packages/gnutls/gnutls-1.4.0
packages/gnutls/gnutls-1.4.0/gnutls-openssl.patch
packages/gnutls/gnutls-1.4.0/gnutls-texinfo-euro.patch
packages/gnutls/gnutls-1.4.4
packages/gnutls/gnutls-1.4.4/gnutls-openssl.patch
packages/gnutls/gnutls-1.4.4/gnutls-texinfo-euro.patch
packages/gnutls/gnutls-1.4.4/onceonly.m4
packages/gnutls/gnutls-1.6.0
packages/gnutls/gnutls_1.0.23.bb
packages/gnutls/gnutls_1.0.25.bb
packages/gnutls/gnutls_1.3.5.bb
packages/gnutls/gnutls_1.4.0.bb
packages/gnutls/gnutls-1.3.5/gnutls-openssl.patch
packages/gnutls/gnutls-1.6.0/gnutls-openssl.patch
packages/gnutls/gnutls/gnutls-openssl.patch
packages/gnutls/gnutls-1.6.0/gnutls-texinfo-euro.patch
packages/gnutls/gnutls/gnutls-texinfo-euro.patch
packages/gnutls/gnutls-1.6.0/onceonly.m4
packages/gnutls/gnutls/onceonly.m4
packages/gnutls/gnutls
packages/gnutls/gnutls.inc
packages/gnutls/gnutls_1.4.4.bb
packages/gnutls/gnutls_1.6.0.bb
Diffs:

#
# mt diff -rde3589519154c78d05730da34ff01264b86a75af -r26ab4051ec6ee9153656e1ea57a1ea5c53aad6ce
#
# 
# 
# delete "packages/gnutls/gnutls-1.0.23"
# 
# delete "packages/gnutls/gnutls-1.0.23/export-symbols.patch"
# 
# delete "packages/gnutls/gnutls-1.0.23/gnutls-openssl.patch"
# 
# delete "packages/gnutls/gnutls-1.0.25"
# 
# delete "packages/gnutls/gnutls-1.0.25/export-symbols.patch"
# 
# delete "packages/gnutls/gnutls-1.0.25/gnutls-openssl.patch"
# 
# delete "packages/gnutls/gnutls-1.3.5"
# 
# delete "packages/gnutls/gnutls-1.3.5/gnutls-texinfo-euro.patch"
# 
# delete "packages/gnutls/gnutls-1.4.0"
# 
# delete "packages/gnutls/gnutls-1.4.0/gnutls-openssl.patch"
# 
# delete "packages/gnutls/gnutls-1.4.0/gnutls-texinfo-euro.patch"
# 
# delete "packages/gnutls/gnutls-1.4.4"
# 
# delete "packages/gnutls/gnutls-1.4.4/gnutls-openssl.patch"
# 
# delete "packages/gnutls/gnutls-1.4.4/gnutls-texinfo-euro.patch"
# 
# delete "packages/gnutls/gnutls-1.4.4/onceonly.m4"
# 
# delete "packages/gnutls/gnutls-1.6.0"
# 
# delete "packages/gnutls/gnutls_1.0.23.bb"
# 
# delete "packages/gnutls/gnutls_1.0.25.bb"
# 
# delete "packages/gnutls/gnutls_1.3.5.bb"
# 
# delete "packages/gnutls/gnutls_1.4.0.bb"
# 
# rename "packages/gnutls/gnutls-1.3.5/gnutls-openssl.patch"
#     to "packages/gnutls/gnutls-1.4.4/gnutls-openssl.patch"
# 
# rename "packages/gnutls/gnutls-1.6.0/gnutls-openssl.patch"
#     to "packages/gnutls/gnutls/gnutls-openssl.patch"
# 
# rename "packages/gnutls/gnutls-1.6.0/gnutls-texinfo-euro.patch"
#     to "packages/gnutls/gnutls/gnutls-texinfo-euro.patch"
# 
# rename "packages/gnutls/gnutls-1.6.0/onceonly.m4"
#     to "packages/gnutls/gnutls/onceonly.m4"
# 
# add_dir "packages/gnutls/gnutls"
# 
# add_dir "packages/gnutls/gnutls-1.4.4"
# 
# add_file "packages/gnutls/gnutls.inc"
#  content [839e704f27526bdae8db90c46ecf8b357deb829c]
# 
# patch "packages/gnutls/gnutls_1.4.4.bb"
#  from [d57fa708207c40e63fe81ccba49c191d95f71545]
#    to [789d682a9597f72219be0892eed5b06ff7e24269]
# 
# patch "packages/gnutls/gnutls_1.6.0.bb"
#  from [d57fa708207c40e63fe81ccba49c191d95f71545]
#    to [5f52ef2a8470117e7aad1edb3d10372f50c098e2]
# 
============================================================
--- packages/gnutls/gnutls.inc	839e704f27526bdae8db90c46ecf8b357deb829c
+++ packages/gnutls/gnutls.inc	839e704f27526bdae8db90c46ecf8b357deb829c
@@ -0,0 +1,42 @@
+DESCRIPTION = "GNU Transport Layer Security Library"
+HOMEPAGE = "http://www.gnu.org/software/gnutls/"
+DEPENDS = "zlib libgcrypt lzo"
+
+LICENSE = "LGPL"
+
+SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \
+           file://gnutls-openssl.patch;patch=1 \
+           file://onceonly.m4 \
+           file://gnutls-texinfo-euro.patch;patch=1"
+
+inherit autotools binconfig
+
+EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1"
+
+do_configure_prepend() {
+        cp ${WORKDIR}/onceonly.m4 ${S}/m4/
+}
+
+do_stage() {
+    oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR}
+    oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR}
+    oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR}
+    autotools_stage_includes
+
+    install -d ${STAGING_DATADIR}/aclocal
+    cp ${S}/lib/libgnutls.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin"
+
+FILES_${PN} = "${libdir}/libgnutls.so.*"
+FILES_${PN}-bin = "${bindir}/gnutls-serv \
+                   ${bindir}/gnutls-cli \
+                   ${bindir}/srptool \
+                   ${bindir}/psktool \
+                   ${bindir}/certtool \
+                   ${bindir}/gnutls-srpcrypt"
+
+FILES_${PN}-dev += "${bindir}/*-config ${bindir}/gnutls-cli-debug"
+FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*"
+FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*"
============================================================
--- packages/gnutls/gnutls_1.4.4.bb	d57fa708207c40e63fe81ccba49c191d95f71545
+++ packages/gnutls/gnutls_1.4.4.bb	789d682a9597f72219be0892eed5b06ff7e24269
@@ -1,41 +1,3 @@
-DESCRIPTION = "GNU Transport Layer Security Library"
-DEPENDS = "zlib libgcrypt lzo"
-HOMEPAGE = "http://www.gnu.org/software/gnutls/"
-LICENSE = "LGPL"
+require gnutls.inc
 
+PR = "r1"
-SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \
-	   file://onceonly.m4 \
-           file://gnutls-openssl.patch;patch=1 \
-           file://gnutls-texinfo-euro.patch;patch=1"
-
-inherit autotools binconfig
-
-do_configure_prepend() {
-        cp ${WORKDIR}/onceonly.m4 ${S}/m4/
-}
-
-PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin"
-FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*"
-FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*"
-FILES_${PN} = "${libdir}/libgnutls.so.*"
-FILES_${PN}-bin = "${bindir}/gnutls-serv \
-		   ${bindir}/gnutls-cli \
-		   ${bindir}/srptool \
-		   ${bindir}/certtool \
-		   ${bindir}/gnutls-srpcrypt \
-		   ${bindir}/psktool"
-
-FILES_${PN}-dev += "${bindir}/*-config ${bindir}/gnutls-cli-debug"
-
-EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1"
-
-do_stage() {
-	oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR}
-	oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR}
-	oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR}
-	autotools_stage_includes
-
-	install -d ${STAGING_DATADIR}/aclocal
-	cp ${S}/lib/libgnutls.m4 ${STAGING_DATADIR}/aclocal/
-}
-
============================================================
--- packages/gnutls/gnutls_1.6.0.bb	d57fa708207c40e63fe81ccba49c191d95f71545
+++ packages/gnutls/gnutls_1.6.0.bb	5f52ef2a8470117e7aad1edb3d10372f50c098e2
@@ -1,41 +1,7 @@
-DESCRIPTION = "GNU Transport Layer Security Library"
-DEPENDS = "zlib libgcrypt lzo"
-HOMEPAGE = "http://www.gnu.org/software/gnutls/"
-LICENSE = "LGPL"
+require gnutls.inc
 
-SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \
-	   file://onceonly.m4 \
-           file://gnutls-openssl.patch;patch=1 \
-           file://gnutls-texinfo-euro.patch;patch=1"
+PR = "r1"
 
-inherit autotools binconfig
-
 do_configure_prepend() {
-        cp ${WORKDIR}/onceonly.m4 ${S}/m4/
+	sed -i "s/2.60/2.59/" ${S}/configure.in
 }
-
-PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin"
-FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*"
-FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*"
-FILES_${PN} = "${libdir}/libgnutls.so.*"
-FILES_${PN}-bin = "${bindir}/gnutls-serv \
-		   ${bindir}/gnutls-cli \
-		   ${bindir}/srptool \
-		   ${bindir}/certtool \
-		   ${bindir}/gnutls-srpcrypt \
-		   ${bindir}/psktool"
-
-FILES_${PN}-dev += "${bindir}/*-config ${bindir}/gnutls-cli-debug"
-
-EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1"
-
-do_stage() {
-	oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR}
-	oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR}
-	oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR}
-	autotools_stage_includes
-
-	install -d ${STAGING_DATADIR}/aclocal
-	cp ${S}/lib/libgnutls.m4 ${STAGING_DATADIR}/aclocal/
-}
-






More information about the Openembedded-commits mailing list