diff options
34 files changed, 387 insertions, 281 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 53139e19fa..2ea5251609 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -10,6 +10,67 @@ def base_path_join(a, *p): path += '/' + b return path +# for MD5/SHA handling +def base_chk_load_parser(config_path): + import ConfigParser, os, bb + parser = ConfigParser.ConfigParser() + if not len(parser.read(config_path)) == 1: + bb.note("Can not open the '%s' ini file" % config_path) + raise Exception("Can not open the '%s'" % config_path) + + return parser + +def base_chk_file(parser, pn, pv, src_uri, localpath): + import os, bb + # Try PN-PV-SRC_URI first and then try PN-SRC_URI + # we rely on the get method to create errors + pn_pv_src = "%s-%s-%s" % (pn,pv,src_uri) + pn_src = "%s-%s" % (pn,src_uri) + if parser.has_section(pn_pv_src): + md5 = parser.get(pn_pv_src, "md5") + sha256 = parser.get(pn_pv_src, "sha256") + elif parser.has_section(pn_src): + md5 = parser.get(pn_src, "md5") + sha256 = parser.get(pn_src, "sha256") + elif parser.has_section(src_uri): + md5 = parser.get(src_uri, "md5") + sha256 = parser.get(src_uri, "sha256") + else: + return False + #raise Exception("Can not find a section for '%s' '%s' and '%s'" % (pn,pv,src_uri)) + + # md5 and sha256 should be valid now + if not os.path.exists(localpath): + bb.note("The locapath does not exist '%s'" % localpath) + raise Exception("The path does not exist '%s'" % localpath) + + + # call md5(sum) and shasum + try: + md5pipe = os.popen('md5sum ' + localpath) + md5data = (md5pipe.readline().split() or [ "" ])[0] + md5pipe.close() + except OSError: + raise Exception("Executing md5sum failed") + + try: + shapipe = os.popen('shasum -a256 -p ' + localpath) + shadata = (shapipe.readline().split() or [ "" ])[0] + shapipe.close() + except OSError: + raise Exception("Executing shasum failed") + + if not md5 == md5data: + bb.note("The MD5Sums did not match. Wanted: '%s' and Got: '%s'" % (md5,md5data)) + raise Exception("MD5 Sums do not match. Wanted: '%s' Got: '%s'" % (md5, md5data)) + + if not sha256 == shadata: + bb.note("The SHA256 Sums do not match. Wanted: '%s' Got: '%s'" % (sha256,shadata)) + raise Exception("SHA256 Sums do not match. Wanted: '%s' Got: '%s'" % (sha256, shadata)) + + return True + + def base_dep_prepend(d): import bb; # @@ -402,6 +463,40 @@ python base_do_fetch() { except bb.fetch.FetchError: (type, value, traceback) = sys.exc_info() raise bb.build.FuncFailed("Fetch failed: %s" % value) + except bb.fetch.MD5SumError: + (type, value, traceback) = sys.exc_info() + raise bb.build.FuncFailed("MD5 failed: %s" % value) + except: + (type, value, traceback) = sys.exc_info() + raise bb.build.FuncFailed("Unknown fetch Error: %s" % value) + + + # Verify the SHA and MD5 sums we have in OE and check what do + # in + check_sum = bb.which(bb.data.getVar('BBPATH', d, True), "conf/checksums.ini") + if not check_sum: + bb.note("No conf/checksums.ini found, not checking checksums") + return + + try: + parser = base_chk_load_parser(check_sum) + except: + bb.note("Creating the CheckSum parser failed") + return + + pv = bb.data.getVar('PV', d, True) + pn = bb.data.getVar('PN', d, True) + + # Check each URI + for url in src_uri.split(): + localpath = bb.fetch.localpath(url,localdata) + (type,host,path,_,_,_) = bb.decodeurl(url) + uri = "%s://%s%s" % (type,host,path) + try: + if not base_chk_file(parser, pn, pv,uri, localpath): + bb.note("%s-%s-%s has no section, not checking URI" % (pn,pv,uri)) + except Exception: + raise bb.build.FuncFailed("Checksum of '%s' failed" % uri) } addtask fetchall after do_fetch diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass index 74bbebf882..a566f0fa42 100644 --- a/classes/cpan.bbclass +++ b/classes/cpan.bbclass @@ -26,6 +26,12 @@ cpan_do_compile () { if test ${TARGET_ARCH} = "sh3" -o ${TARGET_ARCH} = "sh4"; then OPTIONS="LD=${TARGET_ARCH}-${TARGET_OS}-gcc" fi + + if test ${TARGET_ARCH} = "powerpc" ; then + OPTIONS="LD=${TARGET_ARCH}-${TARGET_OS}-gcc" + fi + + oe_runmake PASTHRU_INC="${CFLAGS}" CCFLAGS="${CFLAGS}" $OPTIONS } diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 1f20fa6614..e5a1cd03d4 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -59,6 +59,7 @@ def package_qa_get_machine_dict(): }, "linux-gnueabi" : { "arm" : (40, 0, 0, True, True), + "armeb" : (40, 0, 0, False, True), }, } diff --git a/classes/patch.bbclass b/classes/patch.bbclass index 0a7b94cffc..07d18470f7 100644 --- a/classes/patch.bbclass +++ b/classes/patch.bbclass @@ -3,10 +3,20 @@ def patch_init(d): import os, sys + class NotFoundError(Exception): + def __init__(self, path): + self.path = path + def __str__(self): + return "Error: %s not found." % self.path + def md5sum(fname): import md5, sys - f = file(fname, 'rb') + try: + f = file(fname, 'rb') + except IOError: + raise NotFoundError(fname) + m = md5.new() while True: d = f.read(8096) @@ -24,11 +34,6 @@ def patch_init(d): def __str__(self): return "Command Error: exit status: %d Output:\n%s" % (self.status, self.output) - class NotFoundError(Exception): - def __init__(self, path): - self.path = path - def __str__(self): - return "Error: %s not found." % self.path def runcmd(args, dir = None): import commands @@ -482,7 +487,7 @@ python patch_do_patch() { bb.note("Applying patch '%s'" % pname) try: patchset.Import({"file":unpacked, "remote":url, "strippath": pnum}, True) - except NotFoundError: + except: import sys raise bb.build.FuncFailed(str(sys.exc_value)) resolver.Resolve() diff --git a/conf/checksums.ini b/conf/checksums.ini new file mode 100644 index 0000000000..81b92ad069 --- /dev/null +++ b/conf/checksums.ini @@ -0,0 +1,3 @@ +[file-native-4.20-ftp://ftp.astron.com/pub/file/file-4.20.tar.gz] +md5=402bdb26356791bd5d277099adacc006 +sha256=c0810fb3ddb6cb73c9ff045965e542af6e3eaa7f2995b3037181766d26d5e6e7 diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 9322bb97d8..ab5f3b8f72 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -127,10 +127,6 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" - - - - PREFERRED_VERSION_fontconfig = "2.4.1" PREFERRED_VERSION_freetype = "2.3.1" PREFERRED_VERSION_freetype-native = "2.2.1" @@ -147,6 +143,8 @@ require conf/distro/include/preferred-xorg-versions-X11R7.2.inc PREFERRED_VERSION_gtk+ = "2.10.10" PREFERRED_VERSION_libgnomeui = "2.16.1" +PREFERRED_VERSION_prismstumbler = "0.7.3" + #zap extra stuff taking place in $MACHINE.conf GPE_EXTRA_INSTALL = "" diff --git a/conf/machine/include/zaurus-2.6.conf b/conf/machine/include/zaurus-2.6.conf index 4e9e6a2ad9..1f3313c9b5 100644 --- a/conf/machine/include/zaurus-2.6.conf +++ b/conf/machine/include/zaurus-2.6.conf @@ -11,7 +11,7 @@ ERASEBLOCKSIZE_akita = "0x20000" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" -IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}" +IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}" EXTRA_IMAGEDEPENDS += "zaurus-updater" diff --git a/packages/initscripts/initscripts-1.0/angstrom/.mtn2git_empty b/contrib/qa/checksum/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/initscripts/initscripts-1.0/angstrom/.mtn2git_empty +++ b/contrib/qa/checksum/.mtn2git_empty diff --git a/contrib/qa/checksum/checksum.py b/contrib/qa/checksum/checksum.py new file mode 100644 index 0000000000..6880f045d3 --- /dev/null +++ b/contrib/qa/checksum/checksum.py @@ -0,0 +1,74 @@ +# +# Helper utilitiy to verify checksums of SRC_URI's +# +# To ease parsing I will use INI files to contain the +# checksums, at least they will force some kind of structure. This allows +# to easily add and replace new sums +# +# +# Example: +# [PN-PV-filename] +# md5=THESUM +# sha256=OTHERSUM +# +# [PN-filename] +# md5=THESUM +# sha256=OTHERSUM + + +def verify_file(config_path, pn, pv, src_uri, localpath): + """ + Verify using the INI file at config_path and check that + the localpath matches the one specified by the PN-PV-SRCURI + inside the ini file + """ + import ConfigParser, os + parser = ConfigParser.ConfigParser() + if not len(parser.read(config_path)) == 1: + raise Exception("Can not open the '%s'" % config_path) + + # Try PN-PV-SRC_URI first and then try PN-SRC_URI + # we rely on the get method to create errors + pn_pv_src = "%s-%s-%s" % (pn,pv,src_uri) + pn_src = "%s-%s" % (pn,src_uri) + if parser.has_section(pn_pv_src): + md5 = parser.get(pn_pv_src, "md5") + sha256 = parser.get(pn_pv_src, "sha256") + elif parser.has_section(pn_src): + md5 = parser.get(pn_src, "md5") + sha256 = parser.get(pn_src, "sha256") + else: + raise Exception("Can not find a section for '%s' '%s' and '%s'" % (pn,pv,src_uri)) + + # md5 and sha256 should be valid now + if not os.path.exists(localpath): + raise Exception("The path does not exist '%s'" % localpath) + + + # call md5(sum) and shasum + try: + md5pipe = os.popen('md5sum ' + localpath) + md5data = (md5pipe.readline().split() or [ "" ])[0] + md5pipe.close() + except OSError: + raise Exception("Executing md5sum failed") + + try: + shapipe = os.popen('shasum -a256 -p ' + localpath) + shadata = (shapipe.readline().split() or [ "" ])[0] + shapipe.close() + except OSError: + raise Exception("Executing shasum failed") + + if not md5 == md5data: + raise Exception("MD5 Sums do not match. Wanted: '%s' Got: '%s'" % (md5, md5data)) + + if not sha256 == shadata: + raise Exception("SHA256 Sums do not match. Wanted: '%s' Got: '%s'" % (sha256, shadata)) + + + return True + + +# Test it +verify_file("sample.conf", "qtopia-core", "4.3.0", "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-4.2.3.tar.gz", "test.file") diff --git a/contrib/qa/checksum/sample.conf b/contrib/qa/checksum/sample.conf new file mode 100644 index 0000000000..478a9a05f9 --- /dev/null +++ b/contrib/qa/checksum/sample.conf @@ -0,0 +1,9 @@ +[qtopia-core-4.3-ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-4.3.0beta.tar.gz] +md5=123 +sha256=1000 + +[qtopia-core-ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-4.2.3.tar.gz] +md5=d41d8cd98f00b204e9800998ecf8427e +sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + +# Test commets and such diff --git a/contrib/qa/checksum/test.file b/contrib/qa/checksum/test.file new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/contrib/qa/checksum/test.file diff --git a/packages/efl/edje-native_0.5.0.037.bb b/packages/efl/edje-native_0.5.0.037.bb index 2b8c43644a..4e878ab204 100644 --- a/packages/efl/edje-native_0.5.0.037.bb +++ b/packages/efl/edje-native_0.5.0.037.bb @@ -1,5 +1,5 @@ require edje_${PV}.bb -PR = "r3" +PR = "r4" inherit native @@ -13,7 +13,7 @@ do_configure_prepend() { } do_install_append() { - edje_data_dir=`edje-config --datadir` + edje_data_dir=`${S}/edje-config --datadir` # could also use ${STAGING_DATADIR}/edje/include install -d $edje_data_dir/include install -m 0644 data/include/edje.inc $edje_data_dir/include diff --git a/packages/gpe-aerial/gpe-aerial_0.3.0.bb b/packages/gpe-aerial/gpe-aerial_0.3.0.bb new file mode 100644 index 0000000000..9158305a80 --- /dev/null +++ b/packages/gpe-aerial/gpe-aerial_0.3.0.bb @@ -0,0 +1,11 @@ +inherit gpe autotools + +PR = "r0" +DESCRIPTION = "GPE wireless LAN communication applet" +DEPENDS = "gtk+ libgpewidget prismstumbler" +RDEPENDS = "prismstumbler" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" + +GPE_TARBALL_SUFFIX = "bz2" diff --git a/packages/gpe-calendar/gpe-calendar_svn.bb b/packages/gpe-calendar/gpe-calendar_svn.bb index d6a232b225..d83ee3a151 100644 --- a/packages/gpe-calendar/gpe-calendar_svn.bb +++ b/packages/gpe-calendar/gpe-calendar_svn.bb @@ -10,7 +10,7 @@ RDEPENDS = "gpe-icons" inherit autotools gpe -PV = "0.72+svn${SRCDATE}" +PV = "0.90+svn${SRCDATE}" PR = "r0" SRC_URI = "${GPE_SVN}" diff --git a/packages/gpe-login/files/use-xtscal.patch b/packages/gpe-login/files/use-xtscal.patch new file mode 100644 index 0000000000..dca1163505 --- /dev/null +++ b/packages/gpe-login/files/use-xtscal.patch @@ -0,0 +1,11 @@ +--- /tmp/gpe-login.c 2007-04-01 11:40:29.000000000 +0200 ++++ gpe-login-0.88/gpe-login.c 2007-04-01 11:40:58.205251000 +0200 +@@ -59,7 +59,7 @@ + #define GPE_OWNERINFO_DONTSHOW_FILE "/etc/gpe/gpe-ownerinfo.dontshow" + /* Number of milliseconds to hold the stylus down before recalibration is called */ + #define RECALIBRATION_TIMEOUT 5000 +-#define XTSCAL_PATH "/usr/bin/gpe-xcalibrate.sh" ++#define XTSCAL_PATH "/usr/bin/xtscal" + #ifndef DEBUG + #define DEBUG 0 + #endif diff --git a/packages/gpe-login/gpe-login_0.88.bb b/packages/gpe-login/gpe-login_0.88.bb index ea1723d52d..f42aa4c6a3 100644 --- a/packages/gpe-login/gpe-login_0.88.bb +++ b/packages/gpe-login/gpe-login_0.88.bb @@ -1,13 +1,15 @@ -LICENSE = "GPL" -inherit gpe - DESCRIPTION = "GPE user login screen" SECTION = "gpe" -PRIORITY = "optional" -DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" -RDEPENDS = "xkbd" -RPROVIDES = "gpe-session-starter" -PR = "r0" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" +RDEPENDS = "xkbd" +RPROVIDES = "gpe-session-starter" +PR = "r1" + +inherit gpe SRC_URI += "file://removeblue-fontsize8.patch;patch=1" SRC_URI += " file://chvt-keylaunch.patch;patch=1 " +SRC_URI += " file://use-xtscal.patch;patch=1 " + diff --git a/packages/gpsd/gpsd.inc b/packages/gpsd/gpsd.inc index 1f48fe0052..ffd314d2e8 100644 --- a/packages/gpsd/gpsd.inc +++ b/packages/gpsd/gpsd.inc @@ -6,7 +6,8 @@ DEPENDS = "dbus-glib ncurses" EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ - --enable-dbus" + --enable-dbus \ + --disable-python " SRC_URI = "http://download.berlios.de/gpsd/gpsd-${PV}.tar.gz \ file://gpsd" diff --git a/packages/gsm/files/magician/interpreter-ready.patch b/packages/gsm/files/interpreter-ready.patch index cc6b9c6e2b..cc6b9c6e2b 100644 --- a/packages/gsm/files/magician/interpreter-ready.patch +++ b/packages/gsm/files/interpreter-ready.patch diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index 0b3a29e931..2019185b33 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -11,6 +11,7 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://default" S = "${WORKDIR}/gsm" +SRC_URI_append_htcuniversal = " file://interpreter-ready.patch;patch=1" SRC_URI_append_magician = " file://vendor-tihtc.patch;patch=1 \ file://interpreter-ready.patch;patch=1 \ file://ldisc.patch;patch=1" diff --git a/packages/initscripts/initscripts-1.0/angstrom/checkroot.sh b/packages/initscripts/initscripts-1.0/angstrom/checkroot.sh deleted file mode 100755 index e5fc6ed8b5..0000000000 --- a/packages/initscripts/initscripts-1.0/angstrom/checkroot.sh +++ /dev/null @@ -1,201 +0,0 @@ -# -# checkroot.sh Check to root filesystem. -# -# Version: @(#)checkroot.sh 2.84 25-Jan-2002 miquels@cistron.nl -# - -. /etc/default/rcS - -# -# Set SULOGIN in /etc/default/rcS to yes if you want a sulogin to be spawned -# from this script *before anything else* with a timeout, like SCO does. -# -test "$SULOGIN" = yes && sulogin -t 30 $CONSOLE - -# -# Ensure that bdflush (update) is running before any major I/O is -# performed (the following fsck is a good example of such activity :). -# -test -x /sbin/update && update - -# -# Read /etc/fstab. -# -exec 9>&0 </etc/fstab -rootmode=rw -rootopts=rw -test "$ENABLE_ROOTFS_FSCK" = yes && rootcheck="yes" || rootcheck="no" -swap_on_md=no -devfs= -while read fs mnt type opts dump pass junk -do - case "$fs" in - ""|\#*) - continue; - ;; - /dev/md*) - # Swap on md device. - test "$type" = swap && swap_on_md=yes - ;; - /dev/*) - ;; - *) - # Might be a swapfile. - test "$type" = swap && swap_on_md=yes - ;; - esac - - test "$type" = devfs && devfs="$fs" - - # Currently we do not care about the other entries - if test "$mnt" = "/" - then - #echo "[$fs] [$mnt] [$type] [$opts] [$dump] [$pass] [$junk]" - - rootopts="$opts" - roottype="$type" - - #The "spinner" is broken on busybox sh - TERM=dumb - - test "$pass" = 0 -o "$pass" = "" && rootcheck=no - - # Enable fsck for ext2 and ext3 rootfs, disable for everything else - case "$type" in - ext2|ext3) rootcheck=yes;; - *) rootcheck=no;; - esac - - if test "$rootcheck" = yes - then - if ! test -x "/sbin/fsck.${roottype}" - then - echo -e "\n * * * WARNING: /sbin/fsck.${roottype} is missing! * * *\n" - rootcheck=no - fi - fi - - case "$opts" in - ro|ro,*|*,ro|*,ro,*) - rootmode=ro - ;; - esac - fi -done -exec 0>&9 9>&- - -# -# Activate the swap device(s) in /etc/fstab. This needs to be done -# before fsck, since fsck can be quite memory-hungry. -# -doswap=no -test -d /proc/1 || mount -n /proc -case "`uname -r`" in - 2.[0123].*) - if test $swap_on_md = yes && grep -qs resync /proc/mdstat - then - test "$VERBOSE" != no && echo "Not activating swap - RAID array resyncing" - else - doswap=yes - fi - ;; - *) - doswap=yes - ;; -esac -if test $doswap = yes -then - test "$VERBOSE" != no && echo "Activating swap" - swapon -a 2> /dev/null -fi - -# -# Check the root filesystem. -# -if test -f /fastboot || test $rootcheck = no -then - test $rootcheck = yes && echo "Fast boot, no filesystem check" -else - # - # Ensure that root is quiescent and read-only before fsck'ing. - # - mount -n -o remount,ro / - if test $? = 0 - then - if test -f /forcefsck - then - force="-f" - else - force="" - fi - if test "$FSCKFIX" = yes - then - fix="-y" - else - fix="-a" - fi - spinner="-C" - case "$TERM" in - dumb|network|unknown|"") spinner="" ;; - esac - test `uname -m` = s390 && spinner="" # This should go away - test "$VERBOSE" != no && echo "Checking root filesystem..." - fsck $spinner $force $fix / - # - # If there was a failure, drop into single-user mode. - # - # NOTE: "failure" is defined as exiting with a return code of - # 2 or larger. A return code of 1 indicates that filesystem - # errors were corrected but that the boot may proceed. - # - if test "$?" -gt 1 - then - # Surprise! Re-directing from a HERE document (as in - # "cat << EOF") won't work, because the root is read-only. - echo - echo "fsck failed. Please repair manually and reboot. Please note" - echo "that the root filesystem is currently mounted read-only. To" - echo "remount it read-write:" - echo - echo " # mount -n -o remount,rw /" - echo - echo "CONTROL-D will exit from this shell and REBOOT the system." - echo - # Start a single user shell on the console - /sbin/sulogin $CONSOLE - reboot -f - fi - else - echo "*** ERROR! Cannot fsck root fs because it is not mounted read-only!" - echo - fi -fi - -# -# If the root filesystem was not marked as read-only in /etc/fstab, -# remount the rootfs rw but do not try to change mtab because it -# is on a ro fs until the remount succeeded. Then clean up old mtabs -# and finally write the new mtab. -# This part is only needed if the rootfs was mounted ro. -# - -if [ $(grep "/dev/root" /proc/mounts | awk '{print $4}') = rw ]; then - exit 0 -fi - - -echo "Remounting root file system..." -mount -n -o remount,$rootmode / -if test "$rootmode" = rw -then - if test ! -L /etc/mtab - then - rm -f /etc/mtab~ /etc/nologin - : > /etc/mtab - fi - mount -f -o remount / - mount -f /proc - test "$devfs" && grep -q '^devfs /dev' /proc/mounts && mount -f "$devfs" -fi - -: exit 0 diff --git a/packages/initscripts/initscripts-1.0/checkroot.sh b/packages/initscripts/initscripts-1.0/checkroot.sh index 8a02aa7b58..f3b8a0cd45 100755 --- a/packages/initscripts/initscripts-1.0/checkroot.sh +++ b/packages/initscripts/initscripts-1.0/checkroot.sh @@ -193,7 +193,7 @@ ROOTFSDEV="/dev/root" if ! grep -q "^$ROOTFSDEV\w" /proc/mounts; then ROOTFSDEV="rootfs" fi -if [ $(grep "^$ROOTFSDEV\w" /proc/mounts | awk '{print $4}') = rw ]; then +if [ x$(grep "^$ROOTFSDEV\w" /proc/mounts | awk '{print $4}') = "xrw" ]; then echo "Root filesystem already read-write, not remounting" exit 0 fi diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 33cbf9ca03..83c753d3da 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -5,7 +5,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r87" +PR = "r88" SRC_URI = "file://halt \ file://ramdisk \ diff --git a/packages/libgpevtype/libgpevtype_svn.bb b/packages/libgpevtype/libgpevtype_svn.bb index 213c009d85..88e03c9b64 100644 --- a/packages/libgpevtype/libgpevtype_svn.bb +++ b/packages/libgpevtype/libgpevtype_svn.bb @@ -3,7 +3,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "libmimedir libeventdb" -PV = "0.17+svn${SRCDATE}" +PV = "0.50+svn${SRCDATE}" PR = "r1" inherit pkgconfig gpe autotools diff --git a/packages/linux/linux-handhelds-2.6/hx4700/defconfig b/packages/linux/linux-handhelds-2.6/hx4700/defconfig index 3a0d50e096..49111f9b48 100644 --- a/packages/linux/linux-handhelds-2.6/hx4700/defconfig +++ b/packages/linux/linux-handhelds-2.6/hx4700/defconfig @@ -148,15 +148,14 @@ CONFIG_ARCH_PXA=y CONFIG_MACH_H4700=y CONFIG_HX4700_NAVPOINT=y CONFIG_HX4700_CORE=y -CONFIG_HX4700_TS=y +# CONFIG_HX4700_TS is not set CONFIG_HX4700_BLUETOOTH=y CONFIG_HX4700_PCMCIA=y CONFIG_HX4700_LCD=y CONFIG_HX4700_LEDS=y -CONFIG_HX4700_BATTERY=m -CONFIG_HX4700_POWER=y +CONFIG_HX4700_BATTERY=y +# CONFIG_HX4700_POWER is not set CONFIG_HX4700_UDC=y -CONFIG_HX4700_SERIAL=y # CONFIG_MACH_HX2750 is not set # CONFIG_ARCH_H5400 is not set # CONFIG_MACH_HIMALAYA is not set @@ -167,6 +166,7 @@ CONFIG_HX4700_SERIAL=y # CONFIG_MACH_BLUEANGEL is not set # CONFIG_MACH_HTCBEETLES is not set # CONFIG_MACH_HW6900 is not set +# CONFIG_MACH_HTCATHENA is not set # CONFIG_ARCH_AXIMX3 is not set # CONFIG_ARCH_AXIMX5 is not set # CONFIG_MACH_X30 is not set @@ -911,7 +911,20 @@ CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_NAVPOINT=y # CONFIG_MOUSE_VSXXXAA is not set # CONFIG_INPUT_JOYSTICK is not set -# CONFIG_INPUT_TOUCHSCREEN is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_WM9705 is not set +# CONFIG_TOUCHSCREEN_WM9712 is not set +# CONFIG_TOUCHSCREEN_WM9713 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_ADC is not set +CONFIG_TOUCHSCREEN_ADC_DEBOUNCE=y +# CONFIG_TOUCHSCREEN_UCB1400 is not set CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m @@ -951,6 +964,7 @@ CONFIG_SERIAL_PXA_COUNT=4 # CONFIG_SERIAL_PXA_IR is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_RS232_SERIAL=y CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set @@ -1047,14 +1061,14 @@ CONFIG_I2C_PXA=m # # Dallas's 1-wire bus # -CONFIG_W1=m +CONFIG_W1=y # # 1-wire Bus Masters # # CONFIG_W1_MASTER_DS2490 is not set # CONFIG_W1_MASTER_DS2482 is not set -# CONFIG_W1_DS1WM is not set +CONFIG_W1_DS1WM=y # # 1-wire Slaves @@ -1062,7 +1076,7 @@ CONFIG_W1=m # CONFIG_W1_SLAVE_THERM is not set # CONFIG_W1_SLAVE_SMEM is not set # CONFIG_W1_SLAVE_DS2433 is not set -CONFIG_W1_DS2760=m +CONFIG_W1_DS2760=y # # Hardware Monitoring support @@ -1111,8 +1125,8 @@ CONFIG_HWMON=y # Hardware Monitoring - Battery # CONFIG_BATTERY_MONITOR=y -CONFIG_DS2760_BATTERY=m -CONFIG_ADC_BATTERY=m +CONFIG_DS2760_BATTERY=y +CONFIG_ADC_BATTERY=y CONFIG_APM_POWER=y # @@ -1143,6 +1157,7 @@ CONFIG_HTC_ASIC3_DS1WM=y # Multimedia Capabilities Port drivers # # CONFIG_MCP is not set +CONFIG_ADC=y CONFIG_ADC_ADS7846_SSP=y # CONFIG_ADC_AD7877 is not set # CONFIG_TIFM_CORE is not set @@ -1163,7 +1178,7 @@ CONFIG_LEDS_ASIC3=y # CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y -# CONFIG_LEDS_TRIGGER_HWTIMER is not set +CONFIG_LEDS_TRIGGER_HWTIMER=y # CONFIG_LEDS_TRIGGER_IDE_DISK is not set # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set CONFIG_LEDS_TRIGGER_SHARED=y @@ -1398,7 +1413,6 @@ CONFIG_USB_STORAGE=m # USB Input Devices # CONFIG_USB_HID=m -CONFIG_USB_HIDINPUT=y # CONFIG_USB_HIDINPUT_POWERBOOK is not set # CONFIG_HID_FF is not set CONFIG_USB_HIDDEV=y diff --git a/packages/perl/perl-5.8.7/config.sh-powerpc-linux b/packages/perl/perl-5.8.7/config.sh-powerpc-linux index 6d41d29e9f..67f7aa3166 100644 --- a/packages/perl/perl-5.8.7/config.sh-powerpc-linux +++ b/packages/perl/perl-5.8.7/config.sh-powerpc-linux @@ -53,10 +53,10 @@ byteorder='4321' c='\c' castflags='0' cat='cat' -cc='cc' +cc='gcc' cccdlflags='-fpic' -ccdlflags='-Wl,-E,-Wl,-rpath,/usr/lib/perl5/5.8.7/powerpc-linux/CORE' -ccflags='-fno-strict-aliasing -pipe -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' +ccdlflags='-Wl,-E -Wl,-rpath,/usr/lib/perl5/5.8.7/powerpc-linux/CORE' +ccflags=''-D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' ccname='gcc' ccsymbols='__gnu_linux__=1 __linux=1 __linux__=1 __unix=1 __unix__=1 system=linux system=posix system=unix' @@ -77,12 +77,12 @@ cpio='' cpp='cpp' cpp_stuff='42' cppccsymbols='linux=1 unix=1' -cppflags='-fno-strict-aliasing -pipe' +cppflags='-D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe' cpplast='-' cppminus='-' -cpprun='cc -E' -cppstdin='cc -E' -cppsymbols='_BIG_ENDIAN=1 __BIG_ENDIAN__=1 __ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=4 __GNUC__=4 __GNUC_MINOR__=1 __GNU_LIBRARY__=6 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=200112 _POSIX_SOURCE=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 __linux=1 __linux__=1 __unix=1 __unix__=1' +cpprun='gcc -E' +cppstdin='gcc -E' +cppsymbols='_BIG_ENDIAN=1 __BIG_ENDIAN__=1 __ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=5 __GNUC__=4 __GNUC_MINOR__=1 __GNU_LIBRARY__=6 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=200112 _POSIX_SOURCE=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 __linux=1 __linux__=1 __unix=1 __unix__=1' crypt_r_proto='0' cryptlib='' csh='csh' @@ -131,7 +131,7 @@ d_const='define' d_copysignl='define' d_crypt='define' d_crypt_r='undef' -d_csh='undef' +d_csh='define' d_ctermid_r='undef' d_ctime_r='undef' d_cuserid='define' @@ -147,7 +147,7 @@ d_dosuid='undef' d_drand48_r='undef' d_drand48proto='define' d_dup2='define' -d_eaccess='define' +d_eaccess='undef' d_endgrent='define' d_endgrent_r='undef' d_endhent='define' @@ -162,7 +162,7 @@ d_endsent='define' d_endservent_r='undef' d_eofnblk='define' d_eunice='undef' -d_faststdio='undef' +d_faststdio='define' d_fchdir='define' d_fchmod='define' d_fchown='define' @@ -170,7 +170,7 @@ d_fcntl='define' d_fcntl_can_lock='define' d_fd_macros='define' d_fd_set='define' -d_fds_bits='undef' +d_fds_bits='define' d_fgetpos='define' d_finite='define' d_finitel='define' @@ -293,7 +293,7 @@ d_mktime='define' d_mmap='define' d_modfl='define' d_modfl_pow32_bug='undef' -d_modflproto='define' +d_modflproto='undef' d_mprotect='define' d_msg='define' d_msg_ctrunc='define' @@ -312,7 +312,7 @@ d_mymalloc='undef' d_nice='define' d_nl_langinfo='define' d_nv_preserves_uv='define' -d_off64_t='undef' +d_off64_t='define' d_old_pthread_create_joinable='undef' d_oldpthreads='undef' d_oldsock='undef' @@ -325,9 +325,9 @@ d_pipe='define' d_poll='define' d_portable='define' d_procselfexe='define' -d_pthread_atfork='undef' +d_pthread_atfork='define' d_pthread_attr_setscope='define' -d_pthread_yield='undef' +d_pthread_yield='define' d_pwage='undef' d_pwchange='undef' d_pwclass='undef' @@ -359,7 +359,7 @@ d_seekdir='define' d_select='define' d_sem='define' d_semctl='define' -d_semctl_semid_ds='undef' +d_semctl_semid_ds='define' d_semctl_semun='define' d_semget='define' d_semop='define' @@ -422,12 +422,12 @@ d_statfs_f_flags='undef' d_statfs_s='define' d_statvfs='define' d_stdio_cnt_lval='undef' -d_stdio_ptr_lval='undef' +d_stdio_ptr_lval='define' d_stdio_ptr_lval_nochange_cnt='undef' -d_stdio_ptr_lval_sets_cnt='undef' +d_stdio_ptr_lval_sets_cnt='define' d_stdio_stream_array='undef' -d_stdiobase='undef' -d_stdstdio='undef' +d_stdiobase='define' +d_stdstdio='define' d_strchr='define' d_strcoll='define' d_strctcpy='define' @@ -521,7 +521,7 @@ exe_ext='' expr='expr' extensions='B ByteLoader Cwd Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Time/HiRes Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Errno' extras='' -fflushNULL='undef' +fflushNULL='define' fflushall='undef' find='' firstmakefile='makefile' @@ -667,7 +667,7 @@ i_varargs='undef' i_varhdr='stdarg.h' i_vfork='undef' ignore_versioned_solibs='y' -inc_version_list=' ' +inc_version_list='' inc_version_list_init='0' incpath='' inews='' @@ -706,7 +706,7 @@ ivsize='4' ivtype='long' known_extensions='B ByteLoader Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call GDBM_File I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread Time/HiRes Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared' ksh='' -ld='cc' +ld='gcc' lddlflags='-shared' ldflags='' ldflags_uselargefiles='' @@ -716,9 +716,9 @@ lib_ext='.a' libc='/lib/libc-2.5.so' libperl='libperl.so' libpth='/lib /usr/lib' -libs='-lnsl -ldl -lm -lcrypt -lutil -lc' +libs='-lresolv -lnsl -ldl -lm -lpthread -lcrypt -lutil -lc' libsdirs='' -libsfiles='' +libsfiles=' libresolv.so libnsl.so libdl.so libm.so libpthread.so libcrypt.so libutil.so libc.so' libsfound='' libspath=' /lib /usr/lib' libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD' @@ -764,15 +764,15 @@ myarchname='powerpc-linux' mydomain='.nonet' myhostname='brokenslug' myuname='linux brokenslug 2.6.12.6 #1 tue oct 24 01:06:22 pdt 2006 ppc unknown unknown gnulinux ' -n='' -need_va_copy='define' +n='-n' +need_va_copy='undef' netdb_hlen_type='size_t' netdb_host_type='const void *' netdb_name_type='const char *' netdb_net_type='in_addr_t' nm='nm' nm_opt='' -nm_so_opt='' +nm_so_opt='--dynamic' nonxs_ext='Errno' nroff='nroff' nvEUformat='"E"' @@ -787,8 +787,8 @@ nvtype='double' o_nonblock='O_NONBLOCK' obj_ext='.o' old_pthread_create_joinable='' -optimize='-Os' -orderlib='true' +optimize='-O2' +orderlib='false' osname='linux' osvers='2.6.12.6' otherlibdirs=' ' @@ -801,7 +801,7 @@ perl5='hostperl' perl='' perl_patchlevel='' perladmin='root@brokenslug.nonet' -perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' +perllibs='-lresolv -lnsl -ldl -lm -lpthread -lcrypt -lutil -lc' perlpath='/usr/bin/perl' pg='pg' phostname='hostname' @@ -958,7 +958,7 @@ use64bitint='undef' usecrosscompile='undef' usedl='define' usefaststdio='define' -useithreads='undef' +useithreads='define' uselargefiles='define' uselongdouble='undef' usemallocwrap='define' @@ -971,10 +971,10 @@ useperlio='define' useposix='true' usereentrant='undef' usesfio='false' -useshrplib='false' +useshrplib='true' usesitecustomize='undef' usesocks='undef' -usethreads='undef' +usethreads='define' usevendorprefix='undef' usevfork='false' usrinc='/usr/include' diff --git a/packages/perl/perl-native_5.8.7.bb b/packages/perl/perl-native_5.8.7.bb index eeef2a2bc4..ffbdc4ec32 100644 --- a/packages/perl/perl-native_5.8.7.bb +++ b/packages/perl/perl-native_5.8.7.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Perl is a popular scripting language." HOMEPAGE = "http://www.perl.org/" LICENSE = "Artistic|GPL" -PR = "r3" +PR = "r4" SECTION = "libs" inherit native diff --git a/packages/perl/perl.inc b/packages/perl/perl.inc index 4f42d78ded..f063d0e403 100644 --- a/packages/perl/perl.inc +++ b/packages/perl/perl.inc @@ -46,6 +46,14 @@ do_compile() { if test ${TARGET_ARCH} = "sh3" -o ${TARGET_ARCH} = "sh4"; then OPTIONS="LD=${TARGET_ARCH}-${TARGET_OS}-gcc" fi + + # You must use gcc to link on powerpc also + OPTIONS="" + if test ${TARGET_ARCH} = "powerpc" ; then + OPTIONS="LD=${TARGET_ARCH}-${TARGET_OS}-gcc" + fi + + oe_runmake perl $OPTIONS } diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb index 2f37e6ccbe..12aec88a02 100644 --- a/packages/perl/perl_5.8.7.bb +++ b/packages/perl/perl_5.8.7.bb @@ -21,10 +21,12 @@ SRC_URI_append_sh4 += "file://override-generate-sh.patch;patch=1" SRC_URI_append_sh4 += "file://makefile-usegcc-to-link.patch;patch=1" SRC_URI_append_sh3 += "file://override-generate-sh.patch;patch=1" SRC_URI_append_sh3 += "file://makefile-usegcc-to-link.patch;patch=1" +SRC_URI_append_powerpc += "file://override-generate-sh.patch;patch=1" +SRC_URI_append_powerpc += "file://makefile-usegcc-to-link.patch;patch=1" PARALLEL_MAKE = "" -PR = "r21" +PR = "r22" do_configure() { ln -sf ${HOSTPERL} ${STAGING_BINDIR_NATIVE}/hostperl @@ -44,6 +46,7 @@ do_configure() { cp ${WORKDIR}/config.sh-sh4-linux . #perl insists on an extra config.sh for arm EABI cp config.sh-arm-linux config.sh-arm-linux-gnueabi + cp config.sh-armeb-linux config.sh-armeb-linux-gnueabi # nslu2 LE uclibc builds do not work with the default config.sh if test "${MACHINE}" = nslu2 then diff --git a/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb b/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb new file mode 100644 index 0000000000..44401df7dd --- /dev/null +++ b/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb @@ -0,0 +1,40 @@ +SECTION = "x11/network" +PR = "r0" + +PACKAGES = "prismstumbler prismstumbler-frontend prismstumbler-doc" +DESCRIPTION = "Prismstumbler wireless LAN scanner" +DESCRIPTION_prismstumbler-frontend = "Prismstumbler wireless LAN scanner GTK frontend" +LICENSE = "GPL" +DEPENDS = "libpcap gtk+ wireless-tools sqlite zlib dbus-glib gpsd" +RDEPENDS = "wireless-tools" +RRECOMMENDS = "gpsd" + +SRC_URI = "http://projects.linuxtogo.org/frs/download.php/14/${PN}-0.7.4pre1.tar.gz" + +S = "${WORKDIR}/${PN}-0.7.4pre1" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} \ + --with-libgps=${STAGING_DIR}/${HOST_SYS} \ + --with-libpcap=${STAGING_DIR}/${HOST_SYS} \ + --with-sqlite-includes=${STAGING_INCDIR} \ + --with-sqlite-libs=${STAGING_LIBDIR} \ + --without-athena --enable-dbus" + +CFLAGS =+ "-I${S}/include" +LDFLAGS += "-lz" + +FILES_${PN} = "${bindir}/prismstumbler" + +FILES_prismstumbler-frontend = "${bindir}/psfront ${bindir}/pst \ + ${datadir}/applications \ + ${datadir}/pixmaps ${docdir}/prismstumbler/help.txt \ + ${sysconfdir}" +RDEPENDS_prismstumbler-frontend = "${PN}" + + +do_install_append() { + chmod a+s ${D}${bindir}/prismstumbler +} diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb index 99b9ea44ae..50e47c8202 100644 --- a/packages/tasks/task-slugos.bb +++ b/packages/tasks/task-slugos.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Task packages for the SlugOS distribution" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r6" +PR = "r7" PACKAGE_ARCH = "${MACHINE_ARCH}" ALLOW_EMPTY = "1" @@ -106,7 +106,7 @@ DEPENDS += "${DISTRO_EXTRA_DEPENDS}" RDEPENDS += "\ kernel ixp4xx-npe \ base-files base-passwd netbase \ - busybox initscripts-slugos slugos-init \ + busybox initscripts-slugos slugos-init altboot \ update-modules sysvinit tinylogin \ module-init-tools modutils-initscripts \ ipkg-collateral ipkg ipkg-link \ diff --git a/packages/xorg-app/xdpyinfo_1.0.2.bb b/packages/xorg-app/xdpyinfo_1.0.2.bb new file mode 100644 index 0000000000..62825e5a0f --- /dev/null +++ b/packages/xorg-app/xdpyinfo_1.0.2.bb @@ -0,0 +1,11 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "X display information utility" +LICENSE = "MIT" + +DEPENDS += " libxtst libxext virtual/libx11 libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp" + +SRC_URI += "file://disable-xkb.patch;patch=1" + +EXTRA_OECONF = "--disable-xkb" diff --git a/packages/xorg-proto/xproto-native_7.0.10.bb b/packages/xorg-proto/xproto-native_7.0.10.bb new file mode 100644 index 0000000000..12a58b5a0a --- /dev/null +++ b/packages/xorg-proto/xproto-native_7.0.10.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "X protocol headers" +SECTION = "x11/libs" +LICENSE= "MIT-X" +PE = "1" + +SRC_URI = "${XORG_MIRROR}/individual/proto/xproto-${PV}.tar.bz2" +S = "${WORKDIR}/xproto-${PV}" + +inherit native autotools pkgconfig diff --git a/packages/xorg-xserver/xserver-kdrive-common.inc b/packages/xorg-xserver/xserver-kdrive-common.inc index 72c2a87b32..8674a55e21 100644 --- a/packages/xorg-xserver/xserver-kdrive-common.inc +++ b/packages/xorg-xserver/xserver-kdrive-common.inc @@ -21,7 +21,8 @@ PACKAGES =+ "xserver-kdrive-fbdev \ xserver-kdrive-smi \ xserver-kdrive-vesa \ xserver-kdrive-via \ - " + xserver-kdrive-w100 \ + " SECTION = "x11/base" DESCRIPTION = "X server from freedesktop.org" diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb index e6cd3b2f30..cb58eee8a3 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb @@ -3,12 +3,16 @@ require xserver-kdrive-common.inc DEPENDS += "libxkbfile libxcalibrate" PE = "1" -PR = "r4" +PR = "r5" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ file://enable-xcalibrate.patch;patch=1 \ + file://w100.patch;patch=1 \ " - + S = "${WORKDIR}/xorg-server-${PV}" +W100_OECONF = "--disable-w100" +W100_OECONF_arm = "--enable-w100" + |