[oe-commits] org.oe.dev merge of '3d02f890a5870026e323b8fbf644e2138a51e3a3'
mickeyl commit
openembedded-commits at lists.openembedded.org
Sun Aug 19 17:49:52 UTC 2007
merge of '3d02f890a5870026e323b8fbf644e2138a51e3a3'
and '6f58aae892a3a9e0e720d96f036281d5c255a9a4'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 1f413a8fc168cbef64fe984af210e9d998cc3382
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1f413a8fc168cbef64fe984af210e9d998cc3382
Files:
1
packages/openmoko2/openmoko-contacts2_svn.bb
packages/duma
packages/scummvm/files/fic-gta01
packages/xorg-xserver/xserver-xorg-1.3.0.0
packages/duma/duma_2.5.7.bb
packages/net-snmp/net-snmp-5.4.1/configure-tail.patch
packages/scummvm/files/fic-gta01/openmoko-scummvm
packages/scummvm/files/makefile-nostrip.patch
packages/scummvm/files/scummvm.desktop
packages/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch
classes/rm_work.bbclass
conf/distro/include/slugos.inc
packages/apex/apex-nslu2-16mb_1.5.8.bb
packages/apex/apex-nslu2_1.5.8.bb
packages/gpsd/gpsd.inc
packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
packages/meta/slugos-packages.bb
packages/scummvm/scummvm.inc
packages/scummvm/scummvm_0.9.1.bb
packages/tasks/task-mokogateway.bb
packages/xorg-xserver/xorg-xserver-common.inc
packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
mtn:execute
true
Diffs:
#
# mt diff -r3d02f890a5870026e323b8fbf644e2138a51e3a3 -r1f413a8fc168cbef64fe984af210e9d998cc3382
#
#
#
# patch "packages/openmoko2/openmoko-contacts2_svn.bb"
# from [89c9f22ad6848e8903102483e1732ee620760f5b]
# to [4137abbdd1ecfbb908d43bd9f8c45eca419ea0b8]
#
============================================================
--- packages/openmoko2/openmoko-contacts2_svn.bb 89c9f22ad6848e8903102483e1732ee620760f5b
+++ packages/openmoko2/openmoko-contacts2_svn.bb 4137abbdd1ecfbb908d43bd9f8c45eca419ea0b8
@@ -1,8 +1,9 @@
-DESCRIPTION = "The OpenMoko address book"
+DESCRIPTION = "The OpenMoko Address Book"
SECTION = "openmoko/pim"
+DEPENDS = "libmokoui2 libmokojournal2 dbus-glib"
RDEPENDS = "libedata-book"
PV = "0.1.0+svn${SVNREV}"
-PR = "r2"
+PR = "r4"
inherit openmoko2
#
# mt diff -r6f58aae892a3a9e0e720d96f036281d5c255a9a4 -r1f413a8fc168cbef64fe984af210e9d998cc3382
#
#
#
# add_dir "packages/duma"
#
# add_dir "packages/scummvm/files/fic-gta01"
#
# add_dir "packages/xorg-xserver/xserver-xorg-1.3.0.0"
#
# add_file "packages/duma/duma_2.5.7.bb"
# content [b1ca5760b7d15aded488f0d1f3c54a45f2cb1def]
#
# add_file "packages/net-snmp/net-snmp-5.4.1/configure-tail.patch"
# content [7c81048e14b5ee70bf7636e60b9d4c479a71f661]
#
# add_file "packages/scummvm/files/fic-gta01/openmoko-scummvm"
# content [2151aa3ba2826c460d0618140846150531a098bd]
#
# add_file "packages/scummvm/files/makefile-nostrip.patch"
# content [800d2b32c57cf34ae64bbeab62971be259376c87]
#
# add_file "packages/scummvm/files/scummvm.desktop"
# content [555a291650cf69e4657db44f746545b8179c89cd]
#
# add_file "packages/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch"
# content [72edf4806ea57b3c561a14e789d07709534e163a]
#
# patch "classes/rm_work.bbclass"
# from [3c8ff49c617d0924fef4b991d29f8b91ab35b298]
# to [512e310e8d6f9470aa971cd1e93948fdbdd80492]
#
# patch "conf/distro/include/slugos.inc"
# from [1ed5c83dbbd6bec20b79c26848084996f55b58d2]
# to [a724746ec3f5b6ab813d5d7a21e191799ed2518b]
#
# patch "packages/apex/apex-nslu2-16mb_1.5.8.bb"
# from [14115392139c7f57ea82db2f816b5069fffa2238]
# to [fac18deeba57a44702190636a5aeb017a33d2e86]
#
# patch "packages/apex/apex-nslu2_1.5.8.bb"
# from [a955d4e6ecf87a690890636436fb86c26ee760ec]
# to [15acb3b25031d818b76e970bb441e2b3b6844d3d]
#
# patch "packages/gpsd/gpsd.inc"
# from [bf39dceefc04642d65caefe9f5ad7660f44eb04a]
# to [6ccdc1d0e17c682348f2cf4bf46c24536c69178d]
#
# patch "packages/linux/unslung-kernel_2.4.22.l2.3r63.bb"
# from [b599ca5cfe1b41f4bc77f77d3387c5249106151f]
# to [f75223758a267c3ed4d7b73bcb5deb2688268664]
#
# patch "packages/meta/slugos-packages.bb"
# from [17945a027e80de4d6c5f734175f99298ef499727]
# to [0cce69bb0cbc207a39fab77c3054e03e4eb02abc]
#
# patch "packages/scummvm/scummvm.inc"
# from [881cbe05da932099a88bebbb6f1576dde96ad1d6]
# to [195a28283db02d87e7361fce8f6cda1776848c24]
#
# patch "packages/scummvm/scummvm_0.9.1.bb"
# from [7a143213146b4e648a364d33165d80b505cff402]
# to [a7d83e6abecad479aeba9199278c19affc862fde]
#
# patch "packages/tasks/task-mokogateway.bb"
# from [baab49be88ae0d782d8b73266ba9450f0c4af0a7]
# to [cca68ea72f5d84032e651bc005390558dc96dcb5]
#
# patch "packages/xorg-xserver/xorg-xserver-common.inc"
# from [60aa521448a78ec17e7543808246323e44623474]
# to [9a281ac539ce984563ccaec7aa10f8986035f896]
#
# patch "packages/xorg-xserver/xserver-xorg_1.3.0.0.bb"
# from [c73bffb1e3641cde21223b8fe821232c15036b4d]
# to [c33cdc04da5f76dfa5814af63e8f55d82464ae61]
#
# set "packages/scummvm/files/fic-gta01/openmoko-scummvm"
# attr "mtn:execute"
# value "true"
#
============================================================
--- packages/duma/duma_2.5.7.bb b1ca5760b7d15aded488f0d1f3c54a45f2cb1def
+++ packages/duma/duma_2.5.7.bb b1ca5760b7d15aded488f0d1f3c54a45f2cb1def
@@ -0,0 +1,27 @@
+DESCRIPTION = "A Red-Zone memory allocator to detect unintended memory access"
+HOMEPAGE = "http://duma.sourceforge.net"
+LICENSE = "GPL LGPL"
+SECTION = "devel"
+DEPENDS = "qemu-native"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/duma/duma_2_5_7.tar.gz"
+
+S = "${WORKDIR}/duma_2_5_7"
+
+EXTRA_OECONF = "-e"
+
+do_configure () {
+ oe_runmake createconf
+ qemu-${TARGET_ARCH} -L ${STAGING_DIR}/${HOST_SYS} ./createconf
+}
+
+do_compile () {
+ oe_runmake libduma.a libduma.so.0.0
+}
+
+do_install () {
+ install -d ${D}${base_bindir}
+ install -d ${D}${base_libdir}
+ install -d ${D}${mandir}/man3
+ oe_runmake install prefix="${D}" MAN_INSTALL_DIR="${D}${mandir}/man3"
+}
============================================================
--- packages/net-snmp/net-snmp-5.4.1/configure-tail.patch 7c81048e14b5ee70bf7636e60b9d4c479a71f661
+++ packages/net-snmp/net-snmp-5.4.1/configure-tail.patch 7c81048e14b5ee70bf7636e60b9d4c479a71f661
@@ -0,0 +1,99 @@
+diff -urN net-snmp-5.4.1-orig/acinclude.m4 net-snmp-5.4.1-patched/acinclude.m4
+--- net-snmp-5.4.1-orig/acinclude.m4 2006-08-15 05:25:49.000000000 +0200
++++ net-snmp-5.4.1-patched/acinclude.m4 2007-08-14 13:22:13.000000000 +0200
+@@ -39,7 +39,7 @@
+ dnl
+ AC_DEFUN([AC_PROMPT_USER],
+ [
+-MSG_CHECK=`echo "$2" | tail -1`
++MSG_CHECK=`echo "$2" | tail -n 1`
+ AC_CACHE_CHECK($MSG_CHECK, ac_cv_user_prompt_$1,
+ [echo "" >&AC_FD_MSG
+ AC_PROMPT_USER_NO_DEFINE($1,[$2],$3)
+diff -urN net-snmp-5.4.1-orig/configure net-snmp-5.4.1-patched/configure
+--- net-snmp-5.4.1-orig/configure 2007-07-27 19:04:19.000000000 +0200
++++ net-snmp-5.4.1-patched/configure 2007-08-14 13:22:13.000000000 +0200
+@@ -26417,7 +26417,7 @@
+ # hpux make (at least) doesn't like a trailing \ on the last
+ # line even when the next line contains nothing but
+ # whitespace.
+- lasttoken=`tail -1 mk/$i.mk | awk '{print $1}'`
++ lasttoken=`tail -n 1 mk/$i.mk | awk '{print $1}'`
+ sed "s#$lasttoken \\\\#$lasttoken#" < mk/$i.mk > mk/$i.mk.tmp
+ mv mk/$i.mk.tmp mk/$i.mk
+
+@@ -48793,7 +48793,7 @@
+
+ ME=`$WHOAMI`
+ if test -f /etc/resolv.conf; then
+- LOC=`cat /etc/resolv.conf | grep '^domain' | tail -1 | awk '{print $NF}'`
++ LOC=`cat /etc/resolv.conf | grep '^domain' | tail -n 1 | awk '{print $NF}'`
+ else
+ LOC="@no.where"
+ fi
+@@ -48819,7 +48819,7 @@
+ Providing the --with-default-snmp-version=\"x\" parameter to ./configure
+ will avoid this prompt.
+
+-Default version of SNMP to use" | tail -1`
++Default version of SNMP to use" | tail -n 1`
+ echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
+ echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
+ if test "${ac_cv_user_prompt_NETSNMP_DEFAULT_SNMP_VERSION+set}" = set; then
+@@ -48903,7 +48903,7 @@
+ Providing the --with-sys-contact=\"contact\" parameter to ./configure
+ will avoid this prompt.
+
+-System Contact Information" | tail -1`
++System Contact Information" | tail -n 1`
+ echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
+ echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
+ if test "${ac_cv_user_prompt_NETSNMP_SYS_CONTACT+set}" = set; then
+@@ -48967,7 +48967,7 @@
+ Providing the --with-sys-location=\"location\" parameter to ./configure
+ will avoid this prompt.
+
+-System Location" | tail -1`
++System Location" | tail -n 1`
+ echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
+ echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
+ if test "${ac_cv_user_prompt_NETSNMP_SYS_LOC+set}" = set; then
+@@ -49037,7 +49037,7 @@
+ Providing the --with-logfile=\"path\" parameter to ./configure
+ will avoid this prompt.
+
+-Location to write logfile" | tail -1`
++Location to write logfile" | tail -n 1`
+ echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
+ echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
+ if test "${ac_cv_user_prompt_NETSNMP_LOGFILE+set}" = set; then
+@@ -49114,7 +49114,7 @@
+ Providing the --with-persistent-directory=\"path\" parameter to
+ ./configure will avoid this prompt.
+
+-Location to write persistent information" | tail -1`
++Location to write persistent information" | tail -n 1`
+ echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
+ echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
+ if test "${ac_cv_user_prompt_NETSNMP_PERSISTENT_DIRECTORY+set}" = set; then
+diff -urN net-snmp-5.4.1-orig/configure.in net-snmp-5.4.1-patched/configure.in
+--- net-snmp-5.4.1-orig/configure.in 2007-07-27 19:02:00.000000000 +0200
++++ net-snmp-5.4.1-patched/configure.in 2007-08-14 13:22:13.000000000 +0200
+@@ -2465,7 +2465,7 @@
+ # hpux make (at least) doesn't like a trailing \ on the last
+ # line even when the next line contains nothing but
+ # whitespace.
+- lasttoken=`tail -1 mk/$i.mk | awk '{print $1}'`
++ lasttoken=`tail -n 1 mk/$i.mk | awk '{print $1}'`
+ sed "s#$lasttoken \\\\#$lasttoken#" < mk/$i.mk > mk/$i.mk.tmp
+ mv mk/$i.mk.tmp mk/$i.mk
+
+@@ -4575,7 +4575,7 @@
+
+ ME=`$WHOAMI`
+ if test -f /etc/resolv.conf; then
+- LOC=`cat /etc/resolv.conf | grep '^domain' | tail -1 | awk '{print $NF}'`
++ LOC=`cat /etc/resolv.conf | grep '^domain' | tail -n 1 | awk '{print $NF}'`
+ else
+ LOC="@no.where"
+ fi
============================================================
--- packages/scummvm/files/fic-gta01/openmoko-scummvm 2151aa3ba2826c460d0618140846150531a098bd
+++ packages/scummvm/files/fic-gta01/openmoko-scummvm 2151aa3ba2826c460d0618140846150531a098bd
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# Save current AUX Key mapping
+SAVE_KEY="$(xmodmap -pke | grep 'keycode 8')"
+
+# Map AUX Key to F5
+xmodmap -e "keycode 8 = F5"
+
+# Turn LCD feft
+xrandr -o left
+
+# Start the scummvm in fullscreen mode
+scummvm --fullscreen --themepath=/usr/share/scummvm/
+
+# Turn LCD normal
+xrandr -o normal
+
+# Restore the AUX Key mapping
+xmodmap -e "$SAVE_KEY"
============================================================
--- packages/scummvm/files/makefile-nostrip.patch 800d2b32c57cf34ae64bbeab62971be259376c87
+++ packages/scummvm/files/makefile-nostrip.patch 800d2b32c57cf34ae64bbeab62971be259376c87
@@ -0,0 +1,13 @@
+Index: scummvm-0.9.1/Makefile
+===================================================================
+--- scummvm-0.9.1.orig/Makefile 2007-08-18 13:02:07.000000000 +0200
++++ scummvm-0.9.1/Makefile 2007-08-18 13:02:24.000000000 +0200
+@@ -45,7 +45,7 @@
+
+ install: all
+ $(INSTALL) -d "$(DESTDIR)$(BINDIR)"
+- $(INSTALL) -c -s -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)"
++ $(INSTALL) -c -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)"
+ $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man6/"
+ $(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(MANDIR)/man6/scummvm.6"
+ $(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/pixmaps/"
============================================================
--- packages/scummvm/files/scummvm.desktop 555a291650cf69e4657db44f746545b8179c89cd
+++ packages/scummvm/files/scummvm.desktop 555a291650cf69e4657db44f746545b8179c89cd
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=ScummVM
+Name[pl]=ScummVM
+Comment=Interpreter for several adventure games
+Comment[pl]=Interpreter graficznych gier przygodowych
+Exec=openmoko-scummvm
+Icon=scummvm.xpm
+Terminal=false
+Type=Application
+Categories=Application;Game;AdventureGame;
+StartupNotify=false
============================================================
--- packages/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch 72edf4806ea57b3c561a14e789d07709534e163a
+++ packages/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch 72edf4806ea57b3c561a14e789d07709534e163a
@@ -0,0 +1,11 @@
+--- xorg-server-1.3.0.0.orig/hw/xfree86/os-support/linux/Makefile.am
++++ xorg-server-1.3.0.0/hw/xfree86/os-support/linux/Makefile.am
+@@ -38,7 +38,7 @@
+
+ AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(PLATFORM_DEFINES)
+
+-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
+
+ # FIXME: These need to be added to the build
+ LNX_EXTRA_SOURCES = \
============================================================
--- classes/rm_work.bbclass 3c8ff49c617d0924fef4b991d29f8b91ab35b298
+++ classes/rm_work.bbclass 512e310e8d6f9470aa971cd1e93948fdbdd80492
@@ -7,7 +7,7 @@ RMWORK_ORIG_TASK := "${BB_DEFAULT_TASK}"
#
RMWORK_ORIG_TASK := "${BB_DEFAULT_TASK}"
-BB_DEFAULT_TASK = "rm_work"
+BB_DEFAULT_TASK = "rm_work_all"
do_rm_work () {
cd ${WORKDIR}
@@ -23,4 +23,9 @@ addtask rm_work after do_build
# Uncomment me when we can use bitbake 1.8.8
#addtask rm_work after do_${RMWORK_ORIG_TASK}
addtask rm_work after do_build
+
+do_rm_work_all () {
+ :
+}
+do_rm_work_all[recrdeptask] = "do_rm_work"
+addtask rm_work_all after do_rm_work
-do_rm_work[recrdeptask] = "do_rm_work"
============================================================
--- conf/distro/include/slugos.inc 1ed5c83dbbd6bec20b79c26848084996f55b58d2
+++ conf/distro/include/slugos.inc a724746ec3f5b6ab813d5d7a21e191799ed2518b
@@ -145,3 +145,19 @@ PREFERRED_VERSION_linux-libc-headers = "
#PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225"
PREFERRED_VERSION_linux-libc-headers = "2.6.18"
+
+# we don't ship gtk-directfb by default
+PREFERRED_PROVIDER_gtk+ ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+"
============================================================
--- packages/apex/apex-nslu2-16mb_1.5.8.bb 14115392139c7f57ea82db2f816b5069fffa2238
+++ packages/apex/apex-nslu2-16mb_1.5.8.bb fac18deeba57a44702190636a5aeb017a33d2e86
@@ -1,9 +1,9 @@ LICENSE = "GPL"
DESCRIPTION = "APEX Boot Loader"
SECTION = ""
PRIORITY = "optional"
HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
LICENSE = "GPL"
-# PR = "r1"
+PR = "r1"
# Note that this recipe only works for the NSLU2 at the moment.
# Patches to make it more generic are welcome.
@@ -20,6 +20,8 @@ CMDLINE_ROOT_nas100d = "root=/dev/mtdblo
CMDLINE_ROOT_dsmg600 = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
CMDLINE_ROOT_nas100d = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
+CMDLINE_DEBUG ?= ""
+
EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
oe_runmake() {
============================================================
--- packages/apex/apex-nslu2_1.5.8.bb a955d4e6ecf87a690890636436fb86c26ee760ec
+++ packages/apex/apex-nslu2_1.5.8.bb 15acb3b25031d818b76e970bb441e2b3b6844d3d
@@ -1,9 +1,9 @@ LICENSE = "GPL"
DESCRIPTION = "APEX Boot Loader"
SECTION = ""
PRIORITY = "optional"
HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
LICENSE = "GPL"
-# PR = "r1"
+PR = "r1"
# Note that this recipe only works for the NSLU2 at the moment.
# Patches to make it more generic are welcome.
@@ -20,6 +20,8 @@ CMDLINE_ROOT_nas100d = "root=/dev/mtdblo
CMDLINE_ROOT_dsmg600 = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
CMDLINE_ROOT_nas100d = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
+CMDLINE_DEBUG ?= ""
+
EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
oe_runmake() {
============================================================
--- packages/gpsd/gpsd.inc bf39dceefc04642d65caefe9f5ad7660f44eb04a
+++ packages/gpsd/gpsd.inc 6ccdc1d0e17c682348f2cf4bf46c24536c69178d
@@ -7,7 +7,7 @@ EXTRA_OECONF = "--x-includes=${STAGING_I
EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
--x-libraries=${STAGING_LIBDIR} \
--enable-dbus \
- --disable-python"
+ --enable-python"
SRC_URI = "http://download.berlios.de/gpsd/gpsd-${PV}.tar.gz \
file://gpsd-default \
@@ -23,6 +23,7 @@ do_compile_prepend() {
do_compile_prepend() {
export BUILD_SYS="${BUILD_SYS}"
export HOST_SYS="${HOST_SYS}"
+ find ${S} -name "*.so" -exec rm -f {} \;
}
do_install_prepend() {
@@ -48,7 +49,7 @@ FILES_${PN} += "${sysconfdir}"
PACKAGES =+ "libgps python-pygps"
FILES_${PN} += "${sysconfdir}"
-FILES_libgps = "${libdir}/*.so*"
+FILES_libgps = "${libdir}/*.so.*"
CONFFILES_${PN} = "${sysconfdir}/default/gpsd"
DESCRIPTION_python-pygps = "Python bindings to gpsd"
============================================================
--- packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b599ca5cfe1b41f4bc77f77d3387c5249106151f
+++ packages/linux/unslung-kernel_2.4.22.l2.3r63.bb f75223758a267c3ed4d7b73bcb5deb2688268664
@@ -1,7 +1,7 @@ LICENSE = "GPL"
SECTION = "kernel"
DESCRIPTION = "Vendor-compatible Linux kernel for the Linksys NSLU2 device"
LICENSE = "GPL"
-PR = "r19"
+PR = "r20"
COMPATIBLE_HOST = 'arm.*-linux'
COMPATIBLE_MACHINE = "nslu2"
@@ -39,7 +39,7 @@ KERNEL_IMAGETYPE = "zImage"
ARCH = "arm"
KERNEL_IMAGETYPE = "zImage"
-KERNEL_SUFFIX = "${MACHINE}"
+KERNEL_SUFFIX = "ixp4xxbe"
CMDLINE_CONSOLE ?= "ttyS0,115200"
CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc mem=32M at 0x%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list