aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-02-24 00:40:24 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-02-24 00:40:24 +0000
commit58b704b108847c779bf8fef38bd523183207c1ae (patch)
tree40330a1c0f651134037f3240f2052cb852a218b3
parent90e37d1057ac53c35b542acd4ad953ba8f2ba403 (diff)
downloadopenembedded-58b704b108847c779bf8fef38bd523183207c1ae.tar.gz
openembedded-58b704b108847c779bf8fef38bd523183207c1ae.tar.bz2
openembedded-58b704b108847c779bf8fef38bd523183207c1ae.zip
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/23 18:20:11-06:00 ti.com!kergoth Add gnupg 1.4.0, consolidate common metadata into gnupg.inc, include some of the gnupg doc files in ${docdir}/${PN}/. Build 1.4.0 with readline support. Need to revisit what gnupg features we are compiling in, and perhaps disable some things to shrink the binary, and/or use the "minimal" configure option. 2005/02/23 18:16:53-06:00 ti.com!kergoth Path adjustments in cross and native bbclasses per the previous cset. 2005/02/23 18:14:30-06:00 ti.com!kergoth Fix infodir, mandir, and docdir variables to be relative to datadir, not prefix, and fix FILES_${PN}-doc to reference docdir rather than datadir/doc. BKrev: 421d2278QZWskeJqmJFXCyPjQutiuw
-rw-r--r--classes/cross.bbclass6
-rw-r--r--classes/native.bbclass6
-rw-r--r--conf/bitbake.conf8
-rw-r--r--packages/gnupg/gnupg-1.4.0/15_free_caps.patch (renamed from packages/gnupg/gnupg-1.2.3/m4.patch)0
-rw-r--r--packages/gnupg/gnupg-1.4.0/16_min_privileges.patch (renamed from packages/gnupg/gnupg-1.2.4/m4.patch)0
-rw-r--r--packages/gnupg/gnupg-1.4.0/18_ca_po_update.patch0
-rw-r--r--packages/gnupg/gnupg-1.4.0/21_strgutil_update.patch0
-rw-r--r--packages/gnupg/gnupg.inc0
-rw-r--r--packages/gnupg/gnupg_1.2.3.bb3
-rw-r--r--packages/gnupg/gnupg_1.2.4.bb3
-rw-r--r--packages/gnupg/gnupg_1.4.0.bb0
11 files changed, 16 insertions, 10 deletions
diff --git a/classes/cross.bbclass b/classes/cross.bbclass
index 0f57fe5fd9..5d670ccadc 100644
--- a/classes/cross.bbclass
+++ b/classes/cross.bbclass
@@ -32,9 +32,9 @@ datadir = "${prefix}/share"
sysconfdir = "${prefix}/etc"
sharedstatedir = "${prefix}/com"
localstatedir = "${prefix}/var"
-infodir = "${prefix}/info"
-mandir = "${prefix}/man"
-docdir = "${prefix}/doc"
+infodir = "${datadir}/info"
+mandir = "${datadir}/man"
+docdir = "${datadir}/doc"
servicedir = "${prefix}/srv"
# Architecture dependent paths
diff --git a/classes/native.bbclass b/classes/native.bbclass
index 32bd9dbae2..3391694838 100644
--- a/classes/native.bbclass
+++ b/classes/native.bbclass
@@ -37,9 +37,9 @@ base_libdir = "${base_prefix}/lib"
sysconfdir = "${prefix}/etc"
sharedstatedir = "${prefix}/com"
localstatedir = "${prefix}/var"
-infodir = "${prefix}/info"
-mandir = "${prefix}/man"
-docdir = "${prefix}/doc"
+infodir = "${datadir}/info"
+mandir = "${datadir}/man"
+docdir = "${datadir}/doc"
servicedir = "${prefix}/srv"
# Architecture dependent paths
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index aa5874225c..d7574fc013 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -17,9 +17,9 @@ export datadir = "${prefix}/share"
export sysconfdir = "/etc"
export sharedstatedir = "${prefix}/com"
export localstatedir = "/var"
-export infodir = "${prefix}/info"
-export mandir = "${prefix}/man"
-export docdir = "${prefix}/doc"
+export infodir = "${datadir}/info"
+export mandir = "${datadir}/man"
+export docdir = "${datadir}/doc"
export servicedir = "/srv"
# Architecture dependent paths
@@ -102,7 +102,7 @@ FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
${datadir}/idl ${datadir}/omf ${datadir}/sounds \
${libdir}/bonobo/servers"
SECTION_${PN}-doc = "doc"
-FILES_${PN}-doc = "${datadir}/doc ${mandir} ${infodir} ${datadir}/gtk-doc \
+FILES_${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \
${datadir}/gnome/help"
SECTION_${PN}-dev = "devel"
FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
diff --git a/packages/gnupg/gnupg-1.2.3/m4.patch b/packages/gnupg/gnupg-1.4.0/15_free_caps.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/gnupg/gnupg-1.2.3/m4.patch
+++ b/packages/gnupg/gnupg-1.4.0/15_free_caps.patch
diff --git a/packages/gnupg/gnupg-1.2.4/m4.patch b/packages/gnupg/gnupg-1.4.0/16_min_privileges.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/gnupg/gnupg-1.2.4/m4.patch
+++ b/packages/gnupg/gnupg-1.4.0/16_min_privileges.patch
diff --git a/packages/gnupg/gnupg-1.4.0/18_ca_po_update.patch b/packages/gnupg/gnupg-1.4.0/18_ca_po_update.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnupg/gnupg-1.4.0/18_ca_po_update.patch
diff --git a/packages/gnupg/gnupg-1.4.0/21_strgutil_update.patch b/packages/gnupg/gnupg-1.4.0/21_strgutil_update.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnupg/gnupg-1.4.0/21_strgutil_update.patch
diff --git a/packages/gnupg/gnupg.inc b/packages/gnupg/gnupg.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnupg/gnupg.inc
diff --git a/packages/gnupg/gnupg_1.2.3.bb b/packages/gnupg/gnupg_1.2.3.bb
index e69de29bb2..462bb2b89c 100644
--- a/packages/gnupg/gnupg_1.2.3.bb
+++ b/packages/gnupg/gnupg_1.2.3.bb
@@ -0,0 +1,3 @@
+include gnupg.inc
+
+PR = "r1"
diff --git a/packages/gnupg/gnupg_1.2.4.bb b/packages/gnupg/gnupg_1.2.4.bb
index e69de29bb2..462bb2b89c 100644
--- a/packages/gnupg/gnupg_1.2.4.bb
+++ b/packages/gnupg/gnupg_1.2.4.bb
@@ -0,0 +1,3 @@
+include gnupg.inc
+
+PR = "r1"
diff --git a/packages/gnupg/gnupg_1.4.0.bb b/packages/gnupg/gnupg_1.4.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnupg/gnupg_1.4.0.bb