[oe-commits] org.oe.dev merge of '8e8a1c48faec2dc479cec1aee6c9031525ea9306'

florian commit openembedded-commits at lists.openembedded.org
Wed Jan 23 18:07:05 UTC 2008 

merge of '8e8a1c48faec2dc479cec1aee6c9031525ea9306'
     and 'ec7917dc2ea4817a839295ebf8a8cb597ebb04ff'

Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: 84d6e8f79077a6afd15b7c4d1b4260dba2fc07e6
ViewMTN: http://monotone.openembedded.org/revision/info/84d6e8f79077a6afd15b7c4d1b4260dba2fc07e6
Files:
1
packages/zbedic/libbedic_1.0.bb
packages/zbedic/libbedic_1.1.bb
packages/zbedic/zbedic_1.0.bb
packages/zbedic/zbedic_1.2.bb
packages/font-update-common
packages/font-update-common/files
packages/font-update-common/files/update-fonts
packages/font-update-common/font-update-common_0.1.bb
packages/libgcrypt/libgcrypt_1.4.0.bb
classes/kernel-arch.bbclass
packages/madwifi/madwifi-ng_r2702-20070903.bb
packages/madwifi/madwifi-ng_r2826-20071105.bb
packages/gsm/libgsmd-lips_svn.bb
packages/gpe-filemanager/gpe-filemanager_0.31.bb
packages/openssl/openssl-0.9.7g/avr32.patch
packages/gpephone/libgpephone_svn.bb
packages/openssl/openssl_0.9.7g.bb
Diffs:

#
# mt diff -r8e8a1c48faec2dc479cec1aee6c9031525ea9306 -r84d6e8f79077a6afd15b7c4d1b4260dba2fc07e6
#
# 
# 
# rename "packages/zbedic/libbedic_1.0.bb"
#     to "packages/zbedic/libbedic_1.1.bb"
# 
# rename "packages/zbedic/zbedic_1.0.bb"
#     to "packages/zbedic/zbedic_1.2.bb"
# 
# add_dir "packages/font-update-common"
# 
# add_dir "packages/font-update-common/files"
# 
# add_file "packages/font-update-common/files/update-fonts"
#  content [1b9e3ca0a6c1a92d985a483a69277efc62e85ebf]
# 
# add_file "packages/font-update-common/font-update-common_0.1.bb"
#  content [0ebbd8ef7c30e884b61dc0a06514703e0107c6b5]
# 
# add_file "packages/libgcrypt/libgcrypt_1.4.0.bb"
#  content [b1dae0759fc4781ccd62f97bbf98ed78f9053815]
# 
# patch "classes/kernel-arch.bbclass"
#  from [2c3267a2a81eb0cb438cf4a9c97de95535bedf94]
#    to [7a67a2539558d6a43df7cee45504ba16291c3509]
# 
# patch "packages/madwifi/madwifi-ng_r2702-20070903.bb"
#  from [973b24dc7480d6f461e4f13e327d8cf7ee563dc8]
#    to [3c387ace069d7d168111def437c95ae7f1c5c095]
# 
# patch "packages/madwifi/madwifi-ng_r2826-20071105.bb"
#  from [64f104825a5040d7e47d2df228186913195c7d2f]
#    to [aecfbfb4e0bb5b1e763fa68858e95fff60b21b51]
# 
============================================================
--- packages/font-update-common/files/update-fonts	1b9e3ca0a6c1a92d985a483a69277efc62e85ebf
+++ packages/font-update-common/files/update-fonts	1b9e3ca0a6c1a92d985a483a69277efc62e85ebf
@@ -0,0 +1,4 @@
+#!/bin/sh
+#Author: Rolf Leggewie
+
+run-parts /etc/update-fonts-common.d/
============================================================
--- packages/font-update-common/font-update-common_0.1.bb	0ebbd8ef7c30e884b61dc0a06514703e0107c6b5
+++ packages/font-update-common/font-update-common_0.1.bb	0ebbd8ef7c30e884b61dc0a06514703e0107c6b5
@@ -0,0 +1,13 @@
+DESCRIPTION = "Scripts to be called when fonts are installed or removed \
+to make them known to the WM, whether X11 or Opie"
+AUTHOR = "Rolf Leggewie <oe-devel at rolf.leggewie.biz"
+
+SRC_URI = "file://update-fonts"
+
+do_install() {
+        install -d ${D}${bindir}
+        install -d ${D}${sysconfdir}/update-fonts-common.d/
+        install -m 0755 ${WORKDIR}/update-fonts ${D}${bindir}
+}
+
+PACKAGE_ARCH = "all"
============================================================
--- packages/libgcrypt/libgcrypt_1.4.0.bb	b1dae0759fc4781ccd62f97bbf98ed78f9053815
+++ packages/libgcrypt/libgcrypt_1.4.0.bb	b1dae0759fc4781ccd62f97bbf98ed78f9053815
@@ -0,0 +1,22 @@
+DESCRIPTION = "A general purpose cryptographic library based on the code from GnuPG"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL LGPL FDL"
+DEPENDS = "libgpg-error"
+PR = "r1"
+
+# 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"
+
+ARM_INSTRUCTION_SET = "arm"
+
+do_stage() {
+	autotools_stage_all
+}
============================================================
--- classes/kernel-arch.bbclass	2c3267a2a81eb0cb438cf4a9c97de95535bedf94
+++ classes/kernel-arch.bbclass	7a67a2539558d6a43df7cee45504ba16291c3509
@@ -5,7 +5,7 @@ valid_archs = "alpha cris ia64 \
 #
 
 valid_archs = "alpha cris ia64 \
-               x86_64,i386 \
+               x86_64,i386 x86 \
                m68knommu m68k ppc powerpc ppc64  \
 	       sparc sparc64 \
                arm  arm26 \
============================================================
--- packages/madwifi/madwifi-ng_r2702-20070903.bb	973b24dc7480d6f461e4f13e327d8cf7ee563dc8
+++ packages/madwifi/madwifi-ng_r2702-20070903.bb	3c387ace069d7d168111def437c95ae7f1c5c095
@@ -1,9 +1,7 @@
 # Bitbake recipe for the madwifi-ng driver
 
 # Don't use this unless you know what you're doing -- this version does
 # *NOT* build on BE kernels.
-DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_alix = "1"
 
 # Disable stripping of kernel modules, since this action strips too
 # much out, and the resulting module won't load.
============================================================
--- packages/madwifi/madwifi-ng_r2826-20071105.bb	64f104825a5040d7e47d2df228186913195c7d2f
+++ packages/madwifi/madwifi-ng_r2826-20071105.bb	aecfbfb4e0bb5b1e763fa68858e95fff60b21b51
@@ -1,6 +1,7 @@ DEFAULT_PREFERENCE = "-1"
 # Bitbake recipe for the madwifi-ng driver
 
 DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_alix = "1"
 DEFAULT_PREFERENCE_mpc8323e-rdb = "1"
 
 # Disable stripping of kernel modules, since this action strips too


#
# mt diff -rec7917dc2ea4817a839295ebf8a8cb597ebb04ff -r84d6e8f79077a6afd15b7c4d1b4260dba2fc07e6
#
# 
# 
# delete "packages/gsm/libgsmd-lips_svn.bb"
# 
# add_file "packages/gpe-filemanager/gpe-filemanager_0.31.bb"
#  content [a55ab4f31934ee431d7a73ac816ac41ee85c9d8b]
# 
# add_file "packages/openssl/openssl-0.9.7g/avr32.patch"
#  content [3b5c9b4ba8231648a8048095d6054f16289d3515]
# 
# patch "packages/gpephone/libgpephone_svn.bb"
#  from [c3f4dfe67ee079fe71f23797fde9a011e9fa8fae]
#    to [b4f207b2fa7c58e64eed0846a53c298950c2f46b]
# 
# patch "packages/openssl/openssl_0.9.7g.bb"
#  from [145744ceb1c1d90a5eb05ddcd4947d5f569402ab]
#    to [e1c49f5a11a86d7eb04595e34aeed012e99f1071]
# 
============================================================
--- packages/gpe-filemanager/gpe-filemanager_0.31.bb	a55ab4f31934ee431d7a73ac816ac41ee85c9d8b
+++ packages/gpe-filemanager/gpe-filemanager_0.31.bb	a55ab4f31934ee431d7a73ac816ac41ee85c9d8b
@@ -0,0 +1,13 @@
+
+GPE_TARBALL_SUFFIX = "bz2"
+inherit autotools gpe
+
+PR          = "r0"
+LICENSE     = "GPL"
+DESCRIPTION = "GPE file manager"
+DEPENDS     = "libgpewidget gnome-vfs dbus-glib"
+SECTION = "gpe"
+RDEPENDS    = "gpe-icons"
+RRECOMMENDS = "gnome-vfs-plugin-file gnome-vfs-plugin-smb gnome-vfs-plugin-ftp gnome-vfs-plugin-computer gnome-vfs-plugin-network gnome-vfs-plugin-sftp gnome-vfs-plugin-http"
+
+FILES_${PN} += " ${datadir}/gpe"
============================================================
--- packages/openssl/openssl-0.9.7g/avr32.patch	3b5c9b4ba8231648a8048095d6054f16289d3515
+++ packages/openssl/openssl-0.9.7g/avr32.patch	3b5c9b4ba8231648a8048095d6054f16289d3515
@@ -0,0 +1,10 @@
+--- Configure~	2008-01-23 17:44:04.000000000 +0100
++++ Configure	2008-01-23 17:44:04.000000000 +0100
+@@ -442,6 +442,7 @@
+ "linux-mips",   "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-ppc",    "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:asm/linux_ppc32.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ # -bpowerpc64-linux is transient option, -m64 should be the one to use...
++"linux-avr32","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).",
+ "linux-ppc64",  "gcc:-bpowerpc64-linux -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:asm/linux_ppc64.o:::::::::dlfcn:linux-shared:-fPIC:-bpowerpc64-linux:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-m68k",   "gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG::",
+ "linux-s390",	"gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
============================================================
--- packages/gpephone/libgpephone_svn.bb	c3f4dfe67ee079fe71f23797fde9a011e9fa8fae
+++ packages/gpephone/libgpephone_svn.bb	b4f207b2fa7c58e64eed0846a53c298950c2f46b
@@ -6,9 +6,11 @@ PR          = "r0"
 PV = "0.4+svnr-${SRCREV}"
 PR          = "r0"
 
+inherit gpephone pkgconfig autotools
 SRC_URI = "${GPEPHONE_SVN}"
-inherit gpephone pkgconfig autotools
 
+S = "${WORKDIR}/${PN}"
+
 do_stage () {
 	autotools_stage_all
 }
============================================================
--- packages/openssl/openssl_0.9.7g.bb	145744ceb1c1d90a5eb05ddcd4947d5f569402ab
+++ packages/openssl/openssl_0.9.7g.bb	e1c49f5a11a86d7eb04595e34aeed012e99f1071
@@ -1,11 +1,12 @@ require openssl.inc
 inherit pkgconfig
 
 require openssl.inc
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI += "file://debian.patch;patch=1 \
             file://armeb.patch;patch=1;pnum=0 \
             file://gnueabi-arm.patch;patch=1 \
             file://gnueabi-armeb.patch;patch=1 \
+            file://uclibcgnueabi.patch;patch=1 \
+            file://avr32.patch;patch=1;pnum=0"
-            file://uclibcgnueabi.patch;patch=1"

More information about the Openembedded-commits mailing list