kexec-tools: Update ARM patch for new official syscall number. Distro maintainers be warned, this needs to be changed in kernels..

9 files changed, 26 insertions, 11 deletions

diff --git a/packages/cups/cups_1.2.7.bb b/packages/cups/cups_1.2.7.bb
index 22034f9a23..9660bceaca 100644
--- a/packages/cups/cups_1.2.7.bb
+++ b/packages/cups/cups_1.2.7.bb
@@ -17,6 +17,7 @@ EXTRA_OECONF = " \
 		--enable-browsing \
                 --disable-openssl \
 		--disable-tiff \
+                --without-php \
                "
 
 
diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass
index 4cad10fd73..4f5894f792 100644
--- a/packages/glibc/glibc-package.bbclass
+++ b/packages/glibc/glibc-package.bbclass
@@ -78,6 +78,13 @@ do_install() {
 		grep -v $i ${WORKDIR}/SUPPORTED > ${WORKDIR}/SUPPORTED.tmp
 		mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED
 	done
+	# If indicated, only build a limited selection of locales
+	if [ "${LIMIT_BUILT_LOCALES}" != "${LIMIT_BUILT_LOCALES}" ]; then
+		for i in ${LIMIT_BUILT_LOCALES}; do
+			grep $i ${WORKDIR}/SUPPORTED > ${WORKDIR}/SUPPORTED.tmp
+			mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED
+		done
+	fi
 	rm -f ${D}/etc/rpc
 }
 
@@ -236,7 +243,7 @@ python package_do_split_gconvs () {
 
 	def output_locale_binary(name, locale, encoding):
 		target_arch = bb.data.getVar("TARGET_ARCH", d, 1)
-		qemu = "qemu-%s -r 2.6.16" % target_arch
+		qemu = "qemu-%s" % target_arch
 		pkgname = 'locale-base-' + legitimize_package_name(name)
 		m = re.match("(.*)\.(.*)", name)
 		if m:
diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb
index 985df1dfaa..26df1539e9 100644
--- a/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -12,6 +12,8 @@ GLIBC_EXTRA_OECONF ?= ""
 
 GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN"
 
+LIMIT_BUILT_LOCALES = "en_GB"
+
 #
 # For now, we will skip building of a gcc package if it is a uclibc one
 # and our build is not a uclibc one, and we skip a glibc one if our build
@@ -184,3 +186,4 @@ do_stage() {
 }
 
 require glibc-package.bbclass
+include glibc.inc
diff --git a/packages/gnome/libgnomeui_2.16.1.bb b/packages/gnome/libgnomeui_2.16.1.bb
index 8f3e0a725c..a6700434c3 100644
--- a/packages/gnome/libgnomeui_2.16.1.bb
+++ b/packages/gnome/libgnomeui_2.16.1.bb
@@ -4,6 +4,8 @@ PR = "r0"
 DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
 DESCRIPTION = "GNOME User Interface Library"
 
+DEFAULT_PREFERENCE = "-1"
+
 FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \
 	${libdir}/libglade/*/lib*.so"
 
diff --git a/packages/kexec/kexec-tools-1.101/kexec-tools-arm.patch b/packages/kexec/kexec-tools-1.101/kexec-tools-arm.patch
index b36a476d82..6e43b76096 100644
--- a/packages/kexec/kexec-tools-1.101/kexec-tools-arm.patch
+++ b/packages/kexec/kexec-tools-1.101/kexec-tools-arm.patch
@@ -285,7 +285,7 @@ Index: kexec-tools-1.101/kexec/kexec-syscall.h
  #define __NR_kexec_load		246
  #endif
 +#ifdef __arm__
-+#define __NR_kexec_load		__NR_SYSCALL_BASE + 189  
++#define __NR_kexec_load		__NR_SYSCALL_BASE + 347  
 +#endif
  #ifndef __NR_kexec_load
  #error Unknown processor architecture.  Needs a kexec_load syscall number.
diff --git a/packages/kexec/kexec-tools_1.101.bb b/packages/kexec/kexec-tools_1.101.bb
index fe2b5e1765..4dfab1e06f 100644
--- a/packages/kexec/kexec-tools_1.101.bb
+++ b/packages/kexec/kexec-tools_1.101.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.xmission.com/~ebiederm/files/kexec/"
 SECTION = "kernel/userland"
 DEPENDS = "virtual/kernel zlib"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 inherit autotools
 
diff --git a/packages/nonworking/exult/exult_1.2.bb b/packages/nonworking/exult/exult_1.2.bb
index 2158fe5b37..f20fffbe27 100644
--- a/packages/nonworking/exult/exult_1.2.bb
+++ b/packages/nonworking/exult/exult_1.2.bb
@@ -3,14 +3,17 @@ capable of using the data and graphics files that come with the game. Qt/E based
 SECTION = "opie/games"
 PRIORITY = "optional"
 DEPENDS = "libsdl-qpe libsdl-mixer zlib"
-SRC_URI = "${SOURCEFORGE_MIRROR}/exult/exult-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/exult/exult-${PV}.tar.gz \
+        file://configure_fix.patch;patch=1"
 
 inherit autotools
 
 #FIXME: Add compatible host or so, it is zaurus specific atm.
 
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
+export FT2CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
+
 EXTRA_OECONF = "-host=arm-embeddix-linux-gnu \
-                --with-sdl-prefix=${STAGING_BINDIR}/.. \
                 --disable-exult-studio-support \
                 --disable-debug \
                 --disable-exult-studio \
@@ -22,7 +25,7 @@ EXTRA_OECONF = "-host=arm-embeddix-linux-gnu \
                 --disable-kmid \
                 --with-vorbis-prefix=${STAGING_LIBDIR}/.. \
                 --with-mpeg2-prefix=${STAGING_LIBDIR}/.. \
-                --with-mad-prefix=${STAGING_BINDIR}/.. "
+                --with-mad-prefix=${STAGING_BINDIR_CROSS}/.. "
 
 #CXXFLAGS_append = " -Dmain=SDL_main"
 #CFLAGS_append = " -Dmain=SDL_main"
diff --git a/packages/tasks/task-gpe.bb b/packages/tasks/task-gpe.bb
index b59b3ceea3..5b056e2fdf 100644
--- a/packages/tasks/task-gpe.bb
+++ b/packages/tasks/task-gpe.bb
@@ -119,8 +119,8 @@ RDEPENDS_gpe-task-desktopapps := "\
     thunderbird \
     galculator \
     gnumeric \
-    gpdf \
-    totem"
+    gpdf"
+#    totem"
 
 RDEPENDS_gpe-task-sectest := "\
     mbmerlin \
@@ -128,11 +128,10 @@ RDEPENDS_gpe-task-sectest := "\
     ettercap \
     stunnel \
     curl \
-    dsniff \
+#    dsniff \
     prismstumbler \
     tcpdump \
     kismet \
     hydra \
     thcrut \
     miniclipboard"
-#	driftnet \
diff --git a/packages/xmms/xmms_1.2.10.bb b/packages/xmms/xmms_1.2.10.bb
index ba6c1e115c..846c11c5fe 100644
--- a/packages/xmms/xmms_1.2.10.bb
+++ b/packages/xmms/xmms_1.2.10.bb
@@ -13,7 +13,7 @@ SRC_URI = "http://www.xmms.org/files/1.2.x/xmms-${PV}.tar.bz2 \
 PR = "r3"
 
 RRECOMMENDS_${PN} = "xmms-plugin-output-oss xmms-plugin-output-alsa \
-                    xmms-mad xmms-tremor"
+                    xmms-mad"
 
 inherit autotools binconfig