[oe-commits] org.oe.dev merge of '0636d241febb1e9b04366ce2e9bf469251c2c14f'
florian commit
oe at amethyst.openembedded.net
Thu Jun 5 13:06:13 UTC 2008
merge of '0636d241febb1e9b04366ce2e9bf469251c2c14f'
and '1eef1e73b5df2199d8f8c55ab376f7960e408465'
Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: 95f093e94b7c4156c978c089c2ad1bab2821bea4
ViewMTN: http://monotone.openembedded.org/revision/info/95f093e94b7c4156c978c089c2ad1bab2821bea4
Files:
1
packages/gpe-conf/gpe-conf-0.2.7
packages/gpe-conf/gpe-conf-0.2.7/poweroff.patch
packages/gpe-conf/gpe-conf_0.2.7.bb
conf/distro/angstrom-2008.1.conf
conf/distro/include/angstrom-2008-preferred-versions.inc
conf/distro/include/preferred-om-2008-versions.inc
packages/e17/e-wm/applications.menu
packages/e17/e-wm_cvs.bb
packages/gcc/gcc-4.3.0.inc
packages/gcc/gcc-cross_4.3.0.bb
packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch
packages/glib-2.0/glib-2.0_2.16.1.bb
packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch
packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb
Diffs:
#
# mt diff -r0636d241febb1e9b04366ce2e9bf469251c2c14f -r95f093e94b7c4156c978c089c2ad1bab2821bea4
#
#
#
# add_dir "packages/gpe-conf/gpe-conf-0.2.7"
#
# add_file "packages/gpe-conf/gpe-conf-0.2.7/poweroff.patch"
# content [6ab00b3206763a0a6da1971b569bed117002e6ce]
#
# patch "packages/gpe-conf/gpe-conf_0.2.7.bb"
# from [68996b4d73e9f850d50609f764d56d76224be052]
# to [aec6e705144ef2c216329da9981aabf1bc351607]
#
============================================================
--- packages/gpe-conf/gpe-conf-0.2.7/poweroff.patch 6ab00b3206763a0a6da1971b569bed117002e6ce
+++ packages/gpe-conf/gpe-conf-0.2.7/poweroff.patch 6ab00b3206763a0a6da1971b569bed117002e6ce
@@ -0,0 +1,11 @@
+--- gpe-conf/suid.c~ 2008-06-05 12:41:26.000000000 +0200
++++ gpe-conf/suid.c 2008-06-05 12:41:26.000000000 +0200
+@@ -454,7 +454,7 @@
+ else if (strcmp (cmd, "SHDN") == 0) // shutdown device
+ {
+ fscanf (in, "%100s", arg2);
+- system ("poweroff");
++ system ("/sbin/poweroff");
+ }
+ else if (strcmp (cmd, "MODP") == 0) /* modprobe kernel module */
+ {
============================================================
--- packages/gpe-conf/gpe-conf_0.2.7.bb 68996b4d73e9f850d50609f764d56d76224be052
+++ packages/gpe-conf/gpe-conf_0.2.7.bb aec6e705144ef2c216329da9981aabf1bc351607
@@ -10,12 +10,14 @@ RCONFLICTS_${PN} = "bl"
RPROVIDES_${PN} += " bl"
RCONFLICTS_${PN} = "bl"
-PR = "r0"
+PR = "r1"
GPE_TARBALL_SUFFIX = "bz2"
inherit gpe autotools pkgconfig
+SRC_URI += "file://poweroff.patch;patch=1"
+
PACKAGES += "gpe-conf-panel"
FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \
#
# mt diff -r1eef1e73b5df2199d8f8c55ab376f7960e408465 -r95f093e94b7c4156c978c089c2ad1bab2821bea4
#
#
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [4b22a5418909757b3c14e67557228138743a303e]
# to [3d52f1e5571df17fa87c48dcebdf48af182926c0]
#
# patch "conf/distro/include/angstrom-2008-preferred-versions.inc"
# from [45c7ad8dae151667ad4090f51315c58cf1e5a31b]
# to [63b8040c483bf3e919ec4af86edbea3281c9d341]
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [5f9e99fa45dd0ff3b521383e4f8f11e144767fec]
# to [bd38ba62b84633750ea6d6d25577916cf8bf645a]
#
# patch "packages/e17/e-wm/applications.menu"
# from [4f7e730b41ad9992c457369c69a3b9abbf181b70]
# to [a9a87d037d9d573ec145a458cb1435ddbc389695]
#
# patch "packages/e17/e-wm_cvs.bb"
# from [10fac6f3469627d641a1a831d9875c86b8b3edc3]
# to [81f90d064b09ff63f767ff889341f23d3fa631f9]
#
# patch "packages/gcc/gcc-4.3.0.inc"
# from [7dac0d4ea94fbc3071cf13542d7afc9c97598920]
# to [d4ceae7672f475a16184235ac603437f86c3079e]
#
# patch "packages/gcc/gcc-cross_4.3.0.bb"
# from [1ed2f60e65e1b09e4a5637ab29c85ad02338061f]
# to [cc76abacb299b51bb7da2b6bc0a6f7bec093ebeb]
#
# patch "packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch"
# from [d73ea33ce170fe68af071185f13fa2c5b6c19775]
# to [0c1d43c1538434817791abf0d6ec6b71e8f1260d]
#
# patch "packages/glib-2.0/glib-2.0_2.16.1.bb"
# from [2facce514edcf565a81d088b6aa171df585c7adc]
# to [5be635a5d5196c526c7181cff6b36dcd3a3767f0]
#
# patch "packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch"
# from [ddbc1887bea6b823a043d3ded7f4d0e559b20437]
# to [35247822e917a2c507108b1f5d43662ffb0a219e]
#
# patch "packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb"
# from [692055290e5c89b487551f13668bd1c9eda11a78]
# to [dd10fa5af16341c9504880876d39902c3aba02ee]
#
# patch "packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb"
# from [a680ed356a505b877c44e97cae2f94e0b8508711]
# to [07df3ff65c44bb77ace88de2929a1527ec1cead3]
#
# patch "packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb"
# from [6daaa824b7f17c0f72b64bb07ec26b9fa06463fb]
# to [c936dd787879cf6e135c3cfbfb7ba11343254dc9]
#
============================================================
--- conf/distro/angstrom-2008.1.conf 4b22a5418909757b3c14e67557228138743a303e
+++ conf/distro/angstrom-2008.1.conf 3d52f1e5571df17fa87c48dcebdf48af182926c0
@@ -96,7 +96,7 @@ ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2"
ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2"
#Everybody else can just use this:
-ANGSTROM_GCC_VERSION ?= "4.2.2"
+ANGSTROM_GCC_VERSION ?= "4.2.4"
PREFERRED_VERSION_gcc ?= "${ANGSTROM_GCC_VERSION}"
PREFERRED_VERSION_gcc-cross ?= "${ANGSTROM_GCC_VERSION}"
============================================================
--- conf/distro/include/angstrom-2008-preferred-versions.inc 45c7ad8dae151667ad4090f51315c58cf1e5a31b
+++ conf/distro/include/angstrom-2008-preferred-versions.inc 63b8040c483bf3e919ec4af86edbea3281c9d341
@@ -1,12 +1,21 @@
+PREFERRED_VERSION_automake-native = "1.10"
PREFERRED_VERSION_busybox = "1.9.2"
PREFERRED_VERSION_cairo = "1.6.4"
PREFERRED_VERSION_dbus = "1.2.1"
-PREFERRED_VERSION_glib-2.0 = "2.16.1"
+PREFERRED_VERSION_fontconfig = "2.4.1"
+PREFERRED_VERSION_glib-2.0 = "2.16.3"
PREFERRED_VERSION_gst-pulse = "0.9.7"
-PREFERRED_VERSION_libtool = "1.5.10"
+PREFERRED_VERSION_libsdl-x11 = "1.2.11"
+PREFERRED_VERSION_libtool = "2.2.4"
+PREFERRED_VERSION_libtool-native = "2.2.4"
+PREFERRED_VERSION_libtool-cross = "2.2.4"
+PREFERRED_VERSION_libtool-sdk = "2.2.4"
PREFERRED_VERSION_pango = "1.18.3"
PREFERRED_VERSION_pixman = "0.10.0"
-PREFERRED_VERSION_pulseaudio = "0.9.9"
+PREFERRED_VERSION_pkgconfig = "0.23"
+PREFERRED_VERSION_pkgconfig-native = "0.23"
+PREFERRED_VERSION_pulseaudio = "0.9.10"
+PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2"
PREFERRED_VERSION_udev = "118"
PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
PREFERRED_VERSION_dropbear = "0.50"
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc 5f9e99fa45dd0ff3b521383e4f8f11e144767fec
+++ conf/distro/include/preferred-om-2008-versions.inc bd38ba62b84633750ea6d6d25577916cf8bf645a
@@ -165,7 +165,7 @@ PREFERRED_VERSION_classpath-minimal ?= "
PREFERRED_VERSION_classpath ?= "0.97.1"
PREFERRED_VERSION_classpath-gtk ?= "0.97.1"
PREFERRED_VERSION_classpath-minimal ?= "0.97.1"
-PREFERRED_VERSION_classpath-native ?= "0.97.1"
+PREFERRED_VERSION_classpath-native ?= "0.96.1"
PREFERRED_VERSION_clearsilver ?= "0.10.3"
PREFERRED_VERSION_clish ?= "0.7.1"
PREFERRED_VERSION_cmake-native ?= "2.4.7"
============================================================
--- packages/e17/e-wm/applications.menu 4f7e730b41ad9992c457369c69a3b9abbf181b70
+++ packages/e17/e-wm/applications.menu a9a87d037d9d573ec145a458cb1435ddbc389695
@@ -62,10 +62,15 @@
<Name>Settings</Name>
<Directory>Settings.directory</Directory>
<Include>
- <Or>
- <Category>SystemSettings</Category>
- <Category>Settings</Category>
- </Or>
+ <And>
+ <Or>
+ <Category>SystemSettings</Category>
+ <Category>Settings</Category>
+ </Or>
+ <Not>
+ <Category>System</Category>
+ </Not>
+ </And>
</Include>
</Menu>
============================================================
--- packages/e17/e-wm_cvs.bb 10fac6f3469627d641a1a831d9875c86b8b3edc3
+++ packages/e17/e-wm_cvs.bb 81f90d064b09ff63f767ff889341f23d3fa631f9
@@ -2,10 +2,12 @@ PV = "0.16.999.042+cvs${SRCDATE}"
DEPENDS = "eet evas ecore edje efreet"
LICENSE = "MIT BSD"
PV = "0.16.999.042+cvs${SRCDATE}"
-PR = "r5"
+PR = "r8"
inherit e update-alternatives
+RDEPENDS += "shared-mime-info mime-support"
+
SRC_URI = "${E_CVS};module=e17/apps/e \
file://disable-e-cursor.patch;patch=1 \
file://pkgconfig-fix.patch;patch=1;pnum=0;mindate=20080328;maxdate=20080401 \
@@ -58,6 +60,8 @@ FILES_${PN}-dev += "\
${libdir}/enlightenment/preload/*.?a \
"
+CONFFILES_${PN} = "/etc/xdg/menus/applications.menu"
+
ALTERNATIVE_PATH = "${bindir}/enlightenment_start.oe"
ALTERNATIVE_NAME = "x-window-manager"
ALTERNATIVE_LINK = "${bindir}/x-window-manager"
============================================================
--- packages/gcc/gcc-4.3.0.inc 7dac0d4ea94fbc3071cf13542d7afc9c97598920
+++ packages/gcc/gcc-4.3.0.inc d4ceae7672f475a16184235ac603437f86c3079e
@@ -68,5 +68,5 @@ JAVA = ""
FORTRAN = ""
JAVA = ""
-EXTRA_OECONF_BASE = " --enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
+EXTRA_OECONF_BASE = " --enable-cheaders=c_std --enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
============================================================
--- packages/gcc/gcc-cross_4.3.0.bb 1ed2f60e65e1b09e4a5637ab29c85ad02338061f
+++ packages/gcc/gcc-cross_4.3.0.bb cc76abacb299b51bb7da2b6bc0a6f7bec093ebeb
@@ -7,6 +7,12 @@ SRC_URI_append_fail-fast = " file://zeck
SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+# Hack till we fix *libc properly
+do_stage_append() {
+ ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/
+}
+
+
ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}"
============================================================
--- packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch d73ea33ce170fe68af071185f13fa2c5b6c19775
+++ packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch 0c1d43c1538434817791abf0d6ec6b71e8f1260d
@@ -1,13 +1,29 @@
+Stole from gentoo bugzilla
+http://bugs.gentoo.org/show_bug.cgi?id=156475
+
+Lets this work with gcc 4.2/4.3
+-Khem
Index: glib-2.16.1/glib/gutils.h
===================================================================
---- glib-2.16.1.orig/glib/gutils.h 2008-03-21 16:18:57.000000000 +0100
-+++ glib-2.16.1/glib/gutils.h 2008-03-21 16:19:09.000000000 +0100
-@@ -97,7 +97,7 @@
+--- glib-2.16.1.orig/glib/gutils.h 2008-03-10 17:31:56.000000000 -0700
++++ glib-2.16.1/glib/gutils.h 2008-06-04 15:19:12.000000000 -0700
+@@ -96,13 +96,14 @@
+ #ifdef G_IMPLEMENT_INLINES
# define G_INLINE_FUNC
# undef G_CAN_INLINE
- #elif defined (__GNUC__)
+-#elif defined (__GNUC__)
-# ifdef __GNUC_STDC_INLINE__
-+# ifdef __GNUC_GNU_INLINE__
- # define G_INLINE_FUNC extern inline __attribute__ ((__gnu_inline__))
+-# define G_INLINE_FUNC extern inline __attribute__ ((__gnu_inline__))
++#elif defined (__GNUC__)
++# if __GNUC_PREREQ (4,2) && defined (__STDC_VERSION__) \
++ && __STDC_VERSION__ >= 199901L
++# define G_INLINE_FUNC extern __inline __attribute__ ((__gnu_inline__))
# else
+-# define G_INLINE_FUNC extern inline
++# define G_INLINE_FUNC extern __inline
+ # endif
+-#elif defined (G_CAN_INLINE)
++#elif defined (G_CAN_INLINE)
+ # define G_INLINE_FUNC static inline
+ #else /* can't inline */
+ # define G_INLINE_FUNC
- # define G_INLINE_FUNC extern inline
============================================================
--- packages/glib-2.0/glib-2.0_2.16.1.bb 2facce514edcf565a81d088b6aa171df585c7adc
+++ packages/glib-2.0/glib-2.0_2.16.1.bb 5be635a5d5196c526c7181cff6b36dcd3a3767f0
@@ -1,6 +1,6 @@ require glib.inc
require glib.inc
-PR = "r4"
+PR = "r5"
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
file://glibconfig-sysdefs.h \
============================================================
--- packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch ddbc1887bea6b823a043d3ded7f4d0e559b20437
+++ packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch 35247822e917a2c507108b1f5d43662ffb0a219e
@@ -1,6 +1,7 @@
-diff -r 720080c24d2f arfile.py
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/arfile.py Sun Jan 27 23:26:35 2008 +0200
+Index: ipkg-utils/arfile.py
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ ipkg-utils/arfile.py 2008-05-30 15:33:49.000000000 +0100
@@ -0,0 +1,124 @@
+"""
+arfile - A module to parse GNU ar archives.
@@ -126,10 +127,11 @@ diff -r 720080c24d2f arfile.py
+
+ f2 = tarf.extractfile("control")
+ print f2.read()
-diff -r 720080c24d2f ipkg.py
---- a/ipkg.py Sun Jan 27 23:13:26 2008 +0200
-+++ b/ipkg.py Sun Jan 27 23:26:35 2008 +0200
-@@ -41,6 +41,8 @@ import string
+Index: ipkg-utils/ipkg.py
+===================================================================
+--- ipkg-utils.orig/ipkg.py 2008-05-30 15:33:49.000000000 +0100
++++ ipkg-utils/ipkg.py 2008-05-30 15:35:58.000000000 +0100
+@@ -41,6 +41,8 @@
import string
import commands
from stat import ST_SIZE
@@ -138,7 +140,7 @@ diff -r 720080c24d2f ipkg.py
class Version:
"""A class for holding parsed package version information."""
-@@ -131,77 +133,61 @@ class Package:
+@@ -131,78 +133,63 @@
self.section = None
self.filename_header = None
self.file_list = []
@@ -174,9 +176,9 @@ diff -r 720080c24d2f ipkg.py
- self.md5 = sum.hexdigest()
- else:
- self.md5 = string.join(map((lambda x:"%02x" % ord(x)),sum.digest()),'')
-- stat = os.stat(fn)
+ stat = os.stat(fn)
- self.size = stat[ST_SIZE]
-+
++ self.size = stat[ST_SIZE]
self.filename = os.path.basename(fn)
## sys.stderr.write(" extracting control.tar.gz from %s\n"% (fn,))
- if self.isdeb:
@@ -232,7 +234,7 @@ diff -r 720080c24d2f ipkg.py
self.scratch_dir = None
self.file_dir = None
self.meta_dir = None
-+
+
+ def __getattr__(self, name):
+ if name == "md5":
+ self._computeFileMD5()
@@ -250,10 +252,11 @@ diff -r 720080c24d2f ipkg.py
+ sum.update(data)
+ f.close()
+ self.md5 = sum.hexdigest()
-
++
def read_control(self, control):
import os
-@@ -221,9 +207,15 @@ class Package:
+
+@@ -221,9 +208,15 @@
value = value + '\n' + line
if name == 'size':
self.size = int(value)
@@ -270,7 +273,7 @@ diff -r 720080c24d2f ipkg.py
return # consumes one blank line at end of package descriptoin
else:
line = control.readline()
-@@ -314,7 +306,27 @@ class Package:
+@@ -314,7 +307,27 @@
return self.section
def get_file_list(self):
@@ -299,10 +302,11 @@ diff -r 720080c24d2f ipkg.py
def write_package(self, dirname):
buf = self.render_control()
-diff -r 720080c24d2f setup.py
---- a/setup.py Sun Jan 27 23:13:26 2008 +0200
-+++ b/setup.py Sun Jan 27 23:26:35 2008 +0200
-@@ -16,6 +16,6 @@ distutils.core.setup( name = 'ipkg-utils
+Index: ipkg-utils/setup.py
+===================================================================
+--- ipkg-utils.orig/setup.py 2005-03-03 16:40:17.000000000 +0000
++++ ipkg-utils/setup.py 2008-05-30 15:33:49.000000000 +0100
+@@ -16,6 +16,6 @@
platforms = 'POSIX',
keywords = 'ipkg familiar',
url = 'http://www.handhelds.org/sources.html/',
============================================================
--- packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb 692055290e5c89b487551f13668bd1c9eda11a78
+++ packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb dd10fa5af16341c9504880876d39902c3aba02ee
@@ -1,7 +1,7 @@ RDEPENDS = ""
require ipkg-utils_${PV}.bb
RDEPENDS = ""
-PR = "r17"
+PR = "r18"
inherit native
============================================================
--- packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb a680ed356a505b877c44e97cae2f94e0b8508711
+++ packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb 07df3ff65c44bb77ace88de2929a1527ec1cead3
@@ -5,7 +5,7 @@ SRCDATE = "20050404"
CONFLICTS = "ipkg-link"
RDEPENDS = "python"
SRCDATE = "20050404"
-PR = "r19"
+PR = "r20"
SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
file://ipkg-utils-fix.patch;patch=1 \
============================================================
--- packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb 6daaa824b7f17c0f72b64bb07ec26b9fa06463fb
+++ packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb c936dd787879cf6e135c3cfbfb7ba11343254dc9
@@ -45,7 +45,6 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/
${RPSRC}/integrator_rgb-r1.patch;patch=1;status=hack \
${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \
file://sharpsl-rc-r1.patch;patch=1 \
- file://sharpsl-rc-r2.patch;patch=1 \
file://spitz_h_rewrite.patch;patch=1 \
file://pxa-serial-hack.patch;patch=1;status=hack \
file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
More information about the Openembedded-commits
mailing list