aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Hovland <erik@hovland.org>2006-05-23 20:50:21 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-05-23 20:50:21 +0000
commit014c6dc6a37005cc8518ae0e3f76a2ccb167d46d (patch)
tree976501bf0d0ff062a81270d87f2344ad808fc636
parent7b8c9cabc0b9181040ba22606a3315b30981ab28 (diff)
downloadopenembedded-014c6dc6a37005cc8518ae0e3f76a2ccb167d46d.tar.gz
openembedded-014c6dc6a37005cc8518ae0e3f76a2ccb167d46d.tar.bz2
openembedded-014c6dc6a37005cc8518ae0e3f76a2ccb167d46d.zip
This commit brings my tree in line with Rene's tree for the familiar
0.8.4 release.
-rw-r--r--classes/autotools.bbclass31
-rw-r--r--classes/base.bbclass8
-rw-r--r--classes/image_ipk.bbclass36
-rw-r--r--classes/kernel.bbclass8
-rw-r--r--classes/rootfs_ipk.bbclass8
-rw-r--r--conf/distro/familiar-0.8.3.conf3
-rw-r--r--conf/distro/preferred-gpe-versions-2.7.inc8
-rw-r--r--conf/distro/preferred-gpe-versions.inc2
-rw-r--r--conf/local.conf.sample2
-rw-r--r--conf/machine/h2200.conf3
-rw-r--r--conf/machine/ipaq-pxa270.conf4
-rw-r--r--packages/apmd/apmd_3.2.2.bb3
-rw-r--r--packages/base-files/base-files/h6300/fstab12
-rw-r--r--packages/base-files/base-files_3.0.14.bb2
-rw-r--r--packages/freetype/freetype_2.1.10.bb5
-rw-r--r--packages/gnuz/gnuz_0.3.bb4
-rw-r--r--packages/gpe-aerial/gpe-aerial_0.2.13.bb3
-rw-r--r--packages/gpe-filemanager/gpe-filemanager_0.25.bb4
-rw-r--r--packages/gpe-today/gpe-today_0.11.bb11
-rw-r--r--packages/ipkg/ipkg-native_0.99.154.bb4
-rw-r--r--packages/ipkg/ipkg_0.99.159.bb3
-rw-r--r--packages/konqueror/konqueror-embedded_20030705.bb4
-rw-r--r--packages/libopie/libopie2_1.2.1.bb3
-rw-r--r--packages/linux/handhelds-pxa-2.6_2.6.15-hh1.bb1
-rw-r--r--packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb4
-rw-r--r--packages/meta/gpe-image.bb14
-rw-r--r--packages/meta/meta-gpe.bb8
-rw-r--r--packages/meta/meta-opie.bb4
-rw-r--r--packages/meta/opie-image.bb12
-rw-r--r--packages/meta/task-bootstrap.bb2
-rw-r--r--packages/ppp-dialin/ppp-dialin_0.1.bb8
-rw-r--r--packages/qemu/qemu-native_0.7.0.bb10
-rw-r--r--packages/qpe-games/hexatrolic_1.0beta3.bb2
-rw-r--r--packages/qpe-games/labyrinth_0.7.bb2
-rw-r--r--packages/totem/totem_1.0.4.bb3
-rw-r--r--packages/tslib/tslib/h2200/tslib.sh4
-rw-r--r--packages/tslib/tslib/h3600/tslib.sh4
-rw-r--r--packages/tslib/tslib/h3900/tslib.sh4
-rw-r--r--packages/tslib/tslib/h6300/tslib.sh3
-rw-r--r--packages/tslib/tslib/ipaq-pxa270/tslib.sh3
-rw-r--r--packages/tslib/tslib_cvs.bb7
-rw-r--r--packages/udev/udev_084.bb3
-rw-r--r--packages/xserver-common/xserver-common_1.8.bb5
43 files changed, 193 insertions, 81 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 8d448ce0d3..927e3432b7 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -151,15 +151,32 @@ autotools_stage_includes() {
}
autotools_stage_all() {
- if [ "${INHIBIT_AUTO_STAGE}" != "1" ]
+ if [ "${INHIBIT_AUTO_STAGE}" = "1" ]
then
- rm -rf ${STAGE_TEMP}
- mkdir -p ${STAGE_TEMP}
- oe_runmake DESTDIR="${STAGE_TEMP}" install
- cp -pPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
- cp -pPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
- rm -rf ${STAGE_TEMP}
+ return
+ fi
+ rm -rf ${STAGE_TEMP}
+ mkdir -p ${STAGE_TEMP}
+ oe_runmake DESTDIR="${STAGE_TEMP}" install
+ if [ -d ${STAGE_TEMP}/${includedir} ]; then
+ cp -fpPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
+ fi
+ if [ -d ${STAGE_TEMP}/${libdir} ]
+ then
+ for i in ${STAGE_TEMP}/${libdir}/*.la
+ do
+ if [ ! -f "$i" ]; then
+ cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
+ break
+ fi
+ oe_libinstall -so $(basename $i .la) ${STAGING_LIBDIR}
+ done
+ fi
+ if [ -d ${STAGE_TEMP}/${datadir}/aclocal ]; then
+ install -d ${STAGING_DATADIR}/aclocal
+ cp -fpPR ${STAGE_TEMP}/${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal
fi
+ rm -rf ${STAGE_TEMP}
}
EXPORT_FUNCTIONS do_configure do_install
diff --git a/classes/base.bbclass b/classes/base.bbclass
index c5359b20f8..1ff729822e 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -171,9 +171,8 @@ oe_libinstall() {
if [ -z "$dir" ]; then
dir=`pwd`
fi
- if [ -d "$dir/.libs" ]; then
- dir=$dir/.libs
- fi
+ dotlai=$libname.lai
+ dir=$dir`(cd $dir; find -name "$dotlai") | sed "s/^\.//;s/\/$dotlai\$//;q"`
olddir=`pwd`
__runcmd cd $dir
@@ -191,14 +190,13 @@ oe_libinstall() {
if [ -f "$dota" -o -n "$require_static" ]; then
__runcmd install -m 0644 $dota $destpath/
fi
- dotlai=$libname.lai
if [ -f "$dotlai" -a -n "$libtool" ]; then
if test -n "$staging_install"
then
# stop libtool using the final directory name for libraries
# in staging:
__runcmd rm -f $destpath/$libname.la
- __runcmd sed -e 's/^installed=yes$/installed=no/' $dotlai >$destpath/$libname.la
+ __runcmd sed -e 's/^installed=yes$/installed=no/' -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' $dotlai >$destpath/$libname.la
else
__runcmd install -m 0644 $dotlai $destpath/$libname.la
fi
diff --git a/classes/image_ipk.bbclass b/classes/image_ipk.bbclass
index 5fdd340673..37d4b338d6 100644
--- a/classes/image_ipk.bbclass
+++ b/classes/image_ipk.bbclass
@@ -53,6 +53,32 @@ fakeroot do_rootfs () {
${IMAGE_POSTPROCESS_COMMAND}
}
+DISTRO_LOCALE_FEEDS_PREFIXES ?= ""
+DISTRO_LOCALE_FEEDS_HEADER ?= ""
+
+python __anonymous() {
+ prefixes = bb.data.getVar("DISTRO_LOCALE_FEEDS_PREFIXES", d, 1).split()
+ locale_feeds = bb.data.getVar("DISTRO_LOCALE_FEEDS_HEADER", d, 1)
+
+ # add template
+ locale_feeds += "# For each supported locale there is a subfeed in each of the feed folders.\n"
+ locale_feeds += "# You can use your webbrowser to check for valid locale codes.\n\n"
+ locale_feeds += "# To point ipkg at packages for your locale, replace <my_locale> with the\n"
+ locale_feeds += "# locale code in the template below and remove the leading '#' characters.\n\n"
+ for p in prefixes:
+ locale_feeds += "# src/gz %s-locale-<my_locale> %s/locale/<my_locale>\n" % (p.split('/')[-1], p)
+
+ # add feed for each IMAGE_LINGUA
+ linguas = bb.data.getVar("IMAGE_LINGUAS", d, 1).split()
+ for l in linguas:
+ fst = l.split('-')[0]
+ locale_feeds += "\n# %s locale feeds\n" % fst
+ for p in prefixes:
+ locale_feeds += "src/gz %s-locale-%s %s/locale/%s\n" % (p.split('/')[-1], fst, p, fst)
+
+ bb.data.setVar("DISTRO_LOCALE_FEEDS", locale_feeds, d)
+}
+
insert_feed_uris () {
echo "Building feeds for [${DISTRO}].."
@@ -69,4 +95,14 @@ insert_feed_uris () {
# insert new feed-sources
echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg/${feed_name}-feed.conf
done
+
+ if [ -z ${FEED_URIS} ]; then
+cat > ${IMAGE_ROOTFS}/etc/ipkg/${DISTRO}-${DISTRO_VERSION}-feeds.conf <<EOF
+${DISTRO_FEEDS}
+EOF
+
+cat > ${IMAGE_ROOTFS}/etc/ipkg/${DISTRO}-${DISTRO_VERSION}-locale-feeds.conf <<EOF
+${DISTRO_LOCALE_FEEDS}
+EOF
+ fi
}
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index ff9aeeab78..e663643ce5 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -185,6 +185,7 @@ fi
}
# autoload defaults (alphabetically sorted)
+module_autoload_evdev = "evdev"
module_autoload_hidp = "hidp"
module_autoload_ipv6 = "ipv6"
module_autoload_ipsec = "ipsec"
@@ -231,12 +232,13 @@ python populate_packages_prepend () {
kernelver = bb.data.getVar('PV', d, 1) + bb.data.getVar('KERNEL_LOCALVERSION', d, 1)
kernelver_stripped = kernelver
m = re.match('^(.*-hh.*)[\.\+].*$', kernelver)
- if m:
+ if m and not bb.data.getVar('KERNEL_PRESERVE_HH_MINOR_VER', d, 1):
kernelver_stripped = m.group(1)
path = bb.data.getVar("PATH", d, 1)
host_prefix = bb.data.getVar("HOST_PREFIX", d, 1) or ""
cmd = "PATH=\"%s\" %sdepmod -n -a -r -b %s -F %s/boot/System.map-%s %s" % (path, host_prefix, dvar, dvar, kernelver, kernelver_stripped)
+ bb.debug (1, cmd)
f = os.popen(cmd, 'r')
deps = {}
@@ -267,7 +269,9 @@ python populate_packages_prepend () {
m4 = re.match(pattern4, line)
deps[m2.group(1)].extend(m4.group(1).split())
line = f.readline()
- f.close()
+ if f.close() or not deps:
+ # depmod returned an error or no deps found (very unlikely)
+ raise bb.build.FuncFailed("Failed to extract module dependencies.")
return deps
def get_dependencies(file, pattern, format):
diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 062c957359..8b8c951a2e 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -130,7 +130,13 @@ create_etc_timestamp() {
date +%2m%2d%2H%2M%Y >${IMAGE_ROOTFS}/etc/timestamp
}
+make_zimage_symlink_relative () {
+ if [ -L ${IMAGE_ROOTFS}/boot/zImage ]; then
+ (cd ${IMAGE_ROOTFS}/boot/ && for i in `ls zImage-* | sort`; do ln -sf $i zImage; done)
+ fi
+}
+
# export the zap_root_password and create_etc_timestamp
-EXPORT_FUNCTIONS zap_root_password create_etc_timestamp
+EXPORT_FUNCTIONS zap_root_password create_etc_timestamp make_zimage_symlink_relative
addtask rootfs before do_build after do_install
diff --git a/conf/distro/familiar-0.8.3.conf b/conf/distro/familiar-0.8.3.conf
index d397babb88..0de7d7c2c8 100644
--- a/conf/distro/familiar-0.8.3.conf
+++ b/conf/distro/familiar-0.8.3.conf
@@ -40,9 +40,6 @@ PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15"
CVSDATE_handhelds-pxa-2.6 = "20051221"
CVSDATE_LAB-kernel = "20051221"
-#gomunicator version which adds support for iPAQ h6300.
-CVSDATE_gomunicator = "20060518"
-
#The CSL compiler is unusable because
# 1) certain programs stop to compile
# 2) more programs segfault
diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc
index aea603f33c..cc487d59fe 100644
--- a/conf/distro/preferred-gpe-versions-2.7.inc
+++ b/conf/distro/preferred-gpe-versions-2.7.inc
@@ -23,7 +23,7 @@ PREFERRED_VERSION_glib-2.0 ?= "2.6.4"
PREFERRED_VERSION_gtk+ ?= "2.6.10"
PREFERRED_VERSION_pango ?= "1.8.1"
PREFERRED_VERSION_librsvg ?= "2.6.5"
-PREFERRED_VERSION_libgpewidget ?= "0.109"
+PREFERRED_VERSION_libgpewidget ?= "0.112"
PREFERRED_VERSION_libgpepimc ?= "0.6"
PREFERRED_VERSION_libgpevtype ?= "0.15"
PREFERRED_VERSION_libschedule ?= "0.15"
@@ -44,7 +44,7 @@ PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}"
PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
PREFERRED_VERSION_gpe-login ?= "0.86"
-PREFERRED_VERSION_gpe-session-scripts ?= "0.66"
+PREFERRED_VERSION_gpe-session-scripts ?= "0.67"
PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
PREFERRED_VERSION_gpe-todo ?= "0.55"
PREFERRED_VERSION_gpe-calendar ?= "0.72"
@@ -57,7 +57,7 @@ PREFERRED_VERSION_gpe-beam ?= "0.2.8"
PREFERRED_VERSION_gpe-bluetooth ?= "0.51"
PREFERRED_VERSION_gpe-su ?= "0.19"
PREFERRED_VERSION_gpe-conf ?= "0.1.30"
-PREFERRED_VERSION_gpe-clock ?= "0.23"
+PREFERRED_VERSION_gpe-clock ?= "0.25"
PREFERRED_VERSION_gpe-mininet ?= "0.7"
PREFERRED_VERSION_gpe-mixer ?= "0.42"
PREFERRED_VERSION_gpe-shield ?= "0.9"
@@ -80,7 +80,7 @@ PREFERRED_VERSION_gpe-irc ?= "0.07"
PREFERRED_VERSION_gpe-lights ?= "0.13"
#PREFERRED_VERSION_gpe-nmf ?= "0.21"
PREFERRED_VERSION_gpe-othello ?= "0.2-1"
-PREFERRED_VERSION_gpe-plucker ?= "0.2"
+PREFERRED_VERSION_gpe-plucker ?= "0.4"
PREFERRED_VERSION_gpe-tetris ?= "0.6-4"
PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
PREFERRED_VERSION_xdemineur ?= "2.1.1"
diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc
index 146cf9e17c..b68eb32c2a 100644
--- a/conf/distro/preferred-gpe-versions.inc
+++ b/conf/distro/preferred-gpe-versions.inc
@@ -41,7 +41,7 @@ PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
#PREFERRED_VERSION_gpe-calendar ?= "0.61"
#PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8"
#PREFERRED_VERSION_gpe-contacts ?= "0.36"
-#PREFERRED_VERSION_gpe-today ?= "0.11"
+#PREFERRED_VERSION_gpe-today ?= "0.08"
#PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
PREFERRED_VERSION_dbus ?= "0.23.4"
#PREFERRED_VERSION_gpe-bluetooth ?= "0.38"
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 7194eaf29f..76bf1eda9b 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -118,7 +118,7 @@ BBINCLUDELOGS = "yes"
# Specifies a location to search for pre-generated tarballs when fetching
# a cvs:// URI. Outcomment this, if you always want to pull directly from CVS.
-CVS_TARBALL_STASH = "http://www.oesources.org/source/current/"
+CVS_TARBALL_STASH = "http://familiar.handhelds.org/source/v0.8.4-rc2/sources/"
# EDIT THIS FILE and then remove the line below before using!
REMOVE_THIS_LINE:="${@oe.fatal('Read the comments in your conf/local.conf')}"
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 15b7cdf706..ea81f8f536 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -39,3 +39,6 @@ GPE_EXTRA_DEPENDS += "gaim gpe-filemanager"
GPE_EXTRA_INSTALL += "gaim gpe-filemanager"
include conf/machine/tune-strongarm.conf
+
+# LAB can only resolve relative symlinks
+ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; "
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index 821f71c31a..71dc9becce 100644
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -5,7 +5,7 @@
TARGET_ARCH = "arm"
IPKG_ARCHS = "all arm armv4 armv5te ipaqpxa hx4700"
PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
-PREFERRED_VERSIONS_handhelds-pxa-2.6 = "2.6.12-hh3"
+PREFERRED_VERSION_handhelds-pxa-2.6 = "2.6.15-hh1"
PREFERRED_VERSION_orinoco-modules = "0.15rc1"
@@ -35,7 +35,7 @@ include conf/machine/tune-strongarm.conf
BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}"
HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \
- hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power"
+ hx4700_ts snd_hx4700_audio hx4700_power"
module_autoload_hx4700_power = "hx4700_power"
module_autoload_pcmcia = "pcmcia"
diff --git a/packages/apmd/apmd_3.2.2.bb b/packages/apmd/apmd_3.2.2.bb
index e335e20839..6aa91b0544 100644
--- a/packages/apmd/apmd_3.2.2.bb
+++ b/packages/apmd/apmd_3.2.2.bb
@@ -3,12 +3,11 @@ SECTION = "base"
PRIORITY = "required"
DEPENDS = "libtool-cross"
LICENSE = "GPL"
-PR = "r9"
+PR = "r10"
SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.orig.tar.gz; \
file://debian.patch;patch=1 \
file://workaround.patch;patch=1 \
- file://select-instead-of-sleep.patch;patch=1 \
file://init \
file://default \
file://apmd_proxy \
diff --git a/packages/base-files/base-files/h6300/fstab b/packages/base-files/base-files/h6300/fstab
index 6884b4cc6d..7204361a75 100644
--- a/packages/base-files/base-files/h6300/fstab
+++ b/packages/base-files/base-files/h6300/fstab
@@ -1,8 +1,8 @@
-rootfs / auto defaults 1 1
-proc /proc proc defaults 0 0
-sys /sys sysfs defaults 0 0
-tmpfs /var tmpfs defaults 0 0
+rootfs / auto defaults 1 1
+proc /proc proc defaults 0 0
+sys /sys sysfs defaults 0 0
+tmpfs /var tmpfs defaults 0 0
#The devpts file system provides an interface to pseudo terminal (pty) devices.
-devpts /dev/pts devpts mode=0620,gid=5 0 0
+devpts /dev/pts devpts mode=0620,gid=5 0 0
#Mount first partition from the mmc card.
-/dev/mmcblk0p1 /media/card auto defaults,sync,noauto,noatime,exec,suid 0 0
+/dev/mmcblk0p1 /media/card auto defaults,sync,noauto,noatime,exec,suid 0 0
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index 6d5fb61dca..35357c93cd 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Miscellaneous files for the base system."
SECTION = "base"
PRIORITY = "required"
-PR = "r45"
+PR = "r46"
LICENSE = "GPL"
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/freetype/freetype_2.1.10.bb b/packages/freetype/freetype_2.1.10.bb
index 772b316cc8..35c0d0cbd6 100644
--- a/packages/freetype/freetype_2.1.10.bb
+++ b/packages/freetype/freetype_2.1.10.bb
@@ -2,10 +2,11 @@ DESCRIPTION = "Freetype font rendering library"
HOMEPAGE = "http://www.freetype.org"
SECTION = "libs"
LICENSE = "freetype"
-PR = "r0"
+PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
- file://configure.patch;patch=1"
+ file://configure.patch;patch=1 \
+ file://no-hardcode.patch;patch=1"
S = "${WORKDIR}/freetype-${PV}"
inherit autotools pkgconfig binconfig
diff --git a/packages/gnuz/gnuz_0.3.bb b/packages/gnuz/gnuz_0.3.bb
index 9a164978ff..cf58ea6d7b 100644
--- a/packages/gnuz/gnuz_0.3.bb
+++ b/packages/gnuz/gnuz_0.3.bb
@@ -5,14 +5,14 @@ MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
LICENSE = "GPL"
AUTHOR = "Lukas Fraser"
HOMEPAGE = "http://gnuz.4cows.net/eraser/gnuz/"
-PR = "r2"
+PR = "r1"
APPTYPE = "binary"
APPNAME = "gnuz"
APPDESKTOP = "${S}/data/"
SRC_URI = "http://gnuz.4cows.net/eraser/gnuz/gnuz_0.3.tar.gz \
- http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/gnuz-levels-0.3-1.tar.bz2"
+ http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/gnuz-levels-0.3.tar.bz2"
S = "${WORKDIR}/gnuz"
diff --git a/packages/gpe-aerial/gpe-aerial_0.2.13.bb b/packages/gpe-aerial/gpe-aerial_0.2.13.bb
index 987c6535f6..789c3d05f3 100644
--- a/packages/gpe-aerial/gpe-aerial_0.2.13.bb
+++ b/packages/gpe-aerial/gpe-aerial_0.2.13.bb
@@ -1,6 +1,6 @@
inherit gpe pkgconfig
-PR = "r0"
+PR = "r1"
DESCRIPTION = "GPE wireless LAN communication applet"
@@ -10,3 +10,4 @@ SECTION = "gpe"
PRIORITY = "optional"
LICENSE = "GPL"
+SRC_URI += "file://iconlist.patch;patch=1;pnum=0"
diff --git a/packages/gpe-filemanager/gpe-filemanager_0.25.bb b/packages/gpe-filemanager/gpe-filemanager_0.25.bb
index 898ff6002b..2beee83596 100644
--- a/packages/gpe-filemanager/gpe-filemanager_0.25.bb
+++ b/packages/gpe-filemanager/gpe-filemanager_0.25.bb
@@ -1,12 +1,12 @@
inherit gpe
-PR = "r1"
+PR = "r0"
LICENSE = "GPL"
DESCRIPTION = "GPE file manager"
DEPENDS = "libgpewidget gnome-vfs dbus"
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"
+RRECOMMENDS = "gnome-vfs-plugin-file"
FILES_${PN} += " ${datadir}/gpe"
diff --git a/packages/gpe-today/gpe-today_0.11.bb b/packages/gpe-today/gpe-today_0.11.bb
index 2b02195388..204a21afbb 100644
--- a/packages/gpe-today/gpe-today_0.11.bb
+++ b/packages/gpe-today/gpe-today_0.11.bb
@@ -1,12 +1,9 @@
+LICENSE = "GPL"
+inherit gpe
+
DESCRIPTION = "Displays a summary of appointments and tasks for the day ahead"
DEPENDS = "gtk+ libxrandr libxsettings libxsettings-client libgpewidget libdisplaymigration libeventdb libgpepimc libtododb"
SECTION = "gpe"
PRIORITY = "optional"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
-
-LICENSE = "GPL"
-inherit gpe pkgconfig
-
-
-SRC_URI = "http://www.kernelconcepts.de/~fuchs/files/${P}.tar.gz"
+SRC_URI += "file://no-transparency.patch;patch=1"
diff --git a/packages/ipkg/ipkg-native_0.99.154.bb b/packages/ipkg/ipkg-native_0.99.154.bb
index d59eab3a61..35d654b07e 100644
--- a/packages/ipkg/ipkg-native_0.99.154.bb
+++ b/packages/ipkg/ipkg-native_0.99.154.bb
@@ -1,2 +1,6 @@
include ipkg_${PV}.bb
include ipkg-native.inc
+
+PR = "r1"
+
+SRC_URI += "file://sw.patch;patch=1"
diff --git a/packages/ipkg/ipkg_0.99.159.bb b/packages/ipkg/ipkg_0.99.159.bb
index 47feccd27c..20e547d4b2 100644
--- a/packages/ipkg/ipkg_0.99.159.bb
+++ b/packages/ipkg/ipkg_0.99.159.bb
@@ -1,3 +1,6 @@
include ipkg.inc
+PR = "r1"
+
#SRC_URI += "file://interceptor.patch;patch=1;pnum=1"
+SRC_URI += "file://sw.patch;patch=1"
diff --git a/packages/konqueror/konqueror-embedded_20030705.bb b/packages/konqueror/konqueror-embedded_20030705.bb
index e3fc55a88f..3b2d5ea97c 100644
--- a/packages/konqueror/konqueror-embedded_20030705.bb
+++ b/packages/konqueror/konqueror-embedded_20030705.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition"
SECTION = "opie/applications"
PRIORITY = "optional"
-DEPENDS = "libqpe-opie openssl pcre"
+DEPENDS = "libqpe-opie pcre"
LICENSE = "LGPL/GPL"
PR = "r3"
@@ -30,7 +30,7 @@ EXTRA_OECONF = '--prefix=${palmtopdir} --exec-prefix=${palmtopdir}
--enable-static --disable-shared --disable-debug \
--with-javascript=static --enable-qpe --enable-qt-embedded \
--with-extra-includes=${STAGING_INCDIR} --with-extra-libs=${STAGING_LIBDIR} \
- --with-ssl-version=0.9.7c --with-ssl-dir=${STAGING_LIBDIR}/.. \
+ --without-ssl \
--with-qt-dir=${QTDIR} --with-qtopia-dir=${OPIEDIR} \
--enable-libsuffix="" '
diff --git a/packages/libopie/libopie2_1.2.1.bb b/packages/libopie/libopie2_1.2.1.bb
index dbda15360c..2938537b8b 100644
--- a/packages/libopie/libopie2_1.2.1.bb
+++ b/packages/libopie/libopie2_1.2.1.bb
@@ -1,7 +1,8 @@
include ${PN}.inc
-PR = "r1"
+PR = "r2"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
file://openzaurus-branding.patch;patch=1 \
+ file://prelim-h191x-hx4700-supp.patch;patch=1;pnum=2 \
file://include.pro"
diff --git a/packages/linux/handhelds-pxa-2.6_2.6.15-hh1.bb b/packages/linux/handhelds-pxa-2.6_2.6.15-hh1.bb
index 983d59fd28..77c99bed89 100644
--- a/packages/linux/handhelds-pxa-2.6_2.6.15-hh1.bb
+++ b/packages/linux/handhelds-pxa-2.6_2.6.15-hh1.bb
@@ -2,6 +2,7 @@ SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel for PXA based devices."
MAINTAINER = "Greg Gilbert <greg@treke.net>"
LICENSE = "GPL"
+PR = "r1"
COMPATIBLE_HOST = "arm.*-linux"
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb
index f87cffbc46..a2f19aa74a 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb
@@ -2,7 +2,7 @@ SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices."
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
KERNEL_CCSUFFIX = "-3.3.4"
@@ -19,6 +19,8 @@ SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV'
S = "${WORKDIR}/kernel"
+KERNEL_PRESERVE_HH_MINOR_VER = "1"
+
inherit kernel update-rc.d
K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}"
diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb
index 66d155f690..7d37c4f4fc 100644
--- a/packages/meta/gpe-image.bb
+++ b/packages/meta/gpe-image.bb
@@ -1,9 +1,17 @@
FEED_URIS_append_openzaurus = " x11##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 "
FEED_URIS_append_opensimpad = " x11##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \
gpe##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
-FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11"
-PR = "r23"
+DISTRO_FEEDS_append_familiar () {
+
+# x11 - additional packages specific to the x11 graphical environment
+src/gz x11 ${DISTRO_FEED_PREFIX}/x11
+src/gz x11-${MACHINE} ${DISTRO_FEED_PREFIX}/x11/machine/${MACHINE}
+}
+
+DISTRO_LOCALE_FEEDS_PREFIXES_append_familiar = " ${DISTRO_FEED_PREFIX}/x11"
+
+PR = "r21"
export IMAGE_BASENAME = "gpe-image"
@@ -23,6 +31,7 @@ GPE_EXTRA_INSTALL_smallscreen = "gpe-task-games ${GPE_EXTRA_THEMES}"
#ship more stuff with devices with >16MB of flash
GPE_BIGFLASH_DEPENDS := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\
gpe-theme-clearlooks \
+ sylpheed \
figment \
",d)}'
@@ -54,7 +63,6 @@ export IPKG_INSTALL = "task-bootstrap gpe-task-base \
${XSERVER} \
${GPE_EXTRA_INSTALL}"
-IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp "
ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
inherit image_ipk
diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb
index ecbcbcec20..2c01c268bf 100644
--- a/packages/meta/meta-gpe.bb
+++ b/packages/meta/meta-gpe.bb
@@ -1,7 +1,7 @@
PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games gpe-task-connectivity
DESCRIPTION = "Meta-package for GPE Palmtop Environment"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r44"
+PR = "r45"
ALLOW_EMPTY = "1"
@@ -91,8 +91,10 @@ gpe-task-apps = "\
gpe-what \
matchbox-panel-hacks \
gpe-aerial \
- gpe-soundbite \
- rosetta"
+ gpe-soundbite"
+
+# causes a >15 secs delay on initial boot
+# rosetta"
RDEPENDS_gpe-task-apps := "${gpe-task-apps}"
DEPENDS += " ${gpe-task-apps}"
diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb
index f82a69f367..6cc4ccbf98 100644
--- a/packages/meta/meta-opie.bb
+++ b/packages/meta/meta-opie.bb
@@ -118,7 +118,7 @@ task-opie-apps = "opie-advancedfm opie-bartender opie-calculator \
opie-console opie-dagger opie-embeddedkonsole \
opie-euroconv opie-eye opie-ftp opie-gutenbrowser \
opie-helpbrowser opie-irc opie-keypebble opie-odict \
- opie-oxygen opie-rdesktop opie-reader opie-remote \
+ opie-oxygen opie-reader opie-remote \
opie-sheet opie-tableviewer opie-tinykate \
opie-wellenreiter opie-write opie-zsafe"
@@ -181,7 +181,7 @@ task-opie-irda = "irda-utils libopieobex0 obexftp obexpush"
#
task-opie-extra-apps = "opie-calculator opie-checkbook opie-mail opie-eye \
- opie-rdesktop opie-wellenreiter opie-irc \
+ opie-wellenreiter opie-irc \
opie-mediaplayer2 \
konqueror-embedded qpdf2"
diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb
index e012b2c34f..5c30876dec 100644
--- a/packages/meta/opie-image.bb
+++ b/packages/meta/opie-image.bb
@@ -3,7 +3,15 @@ export IMAGE_LINGUAS = ""
FEED_URIS_append_openzaurus = " opie##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie"
FEED_URIS_append_opensimpad = " opie##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie"
-FEED_URIS_append_familiar = " opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie"
+
+DISTRO_FEEDS_append_familiar () {
+
+# opie - additional packages specific to the opie graphical environment
+src/gz opie ${DISTRO_FEED_PREFIX}/opie
+src/gz opie-${MACHINE} ${DISTRO_FEED_PREFIX}/opie/machine/${MACHINE}
+}
+
+DISTRO_LOCALE_FEEDS_PREFIXES_append_familiar = " ${DISTRO_FEED_PREFIX}/opie"
LICENSE = "MIT"
PR = "r19"
@@ -66,6 +74,6 @@ merge_feeds() {
}
# merge feed-sources into ipkg.conf and create /etc/timestamp from build date
-IMAGE_PREPROCESS_COMMAND = "merge_feeds; create_etc_timestamp"
+IMAGE_PREPROCESS_COMMAND = "merge_feeds; "
inherit image_ipk
diff --git a/packages/meta/task-bootstrap.bb b/packages/meta/task-bootstrap.bb
index 31920135d4..1583e9976c 100644
--- a/packages/meta/task-bootstrap.bb
+++ b/packages/meta/task-bootstrap.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Core packages required for a basic installation"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r25"
+PR = "r26"
# The BOOTSTRAP_EXTRA_ variables are often manipulated by the
# MACHINE .conf files, so adjust PACKAGE_ARCH accordingly.
diff --git a/packages/ppp-dialin/ppp-dialin_0.1.bb b/packages/ppp-dialin/ppp-dialin_0.1.bb
index 815ed14d3b..0d0426790f 100644
--- a/packages/ppp-dialin/ppp-dialin_0.1.bb
+++ b/packages/ppp-dialin/ppp-dialin_0.1.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Enables PPP dial-in through a serial connection"
MAINTAINER = "Rene Wagner <rw@handhelds.org>"
DEPENDS = "ppp"
RDEPENDS = "ppp"
-PR = "r4"
+PR = "r5"
LICENSE = "MIT"
SRC_URI = "file://host-peer \
@@ -22,7 +22,11 @@ pkg_postinst() {
if test "x$D" != "x"; then
exit 1
else
- adduser --system --home /dev/null --no-create-home --empty-password --ingroup nogroup -s ${sbindir}/ppp-dialin ppp
+ if grep -q '^ppp:' /etc/passwd; then
+ echo "ppp: login exists"
+ else
+ adduser --system --home /dev/null --no-create-home --empty-password --ingroup nogroup -s ${sbindir}/ppp-dialin ppp
+ fi
fi
}
diff --git a/packages/qemu/qemu-native_0.7.0.bb b/packages/qemu/qemu-native_0.7.0.bb
index caa6f6abc0..9e58b5f176 100644
--- a/packages/qemu/qemu-native_0.7.0.bb
+++ b/packages/qemu/qemu-native_0.7.0.bb
@@ -3,3 +3,13 @@ inherit native
S = "${WORKDIR}/qemu-${PV}"
prefix = "${STAGING_DIR}/${BUILD_SYS}"
+python __anonymous() {
+ from bb import which, data
+
+ path = data.getVar('PATH', d)
+ if len(which(path, 'gcc-3.4')) != 0:
+ data.setVar('EXTRA_OECONF', " --cc=gcc-3.4", d)
+ elif len(which(path, 'gcc-3.3')) != 0:
+ data.setVar('EXTRA_OECONF', " --cc=gcc-3.3", d)
+
+}
diff --git a/packages/qpe-games/hexatrolic_1.0beta3.bb b/packages/qpe-games/hexatrolic_1.0beta3.bb
index c1528165ce..8d83421dd6 100644
--- a/packages/qpe-games/hexatrolic_1.0beta3.bb
+++ b/packages/qpe-games/hexatrolic_1.0beta3.bb
@@ -1,11 +1,11 @@
DESCRIPTION = "Hexatrolic a Ball Game"
SECTION = "opie/games"
PRIORITY = "optional"
-MAINTAINER = "none"
LICENSE = "GPL"
AUTHOR = "Helge Plehn"
HOMEPAGE = "http://hexatrolic.i-networx.de/"
APPNAME = "hexatrolic"
+PR = "r1"
SRC_URI = "http://handhelds.org/~zecke/oe_packages/hexatrolic-103beta3-zecke1.tar.bz2"
diff --git a/packages/qpe-games/labyrinth_0.7.bb b/packages/qpe-games/labyrinth_0.7.bb
index e7468b507b..40b2f73b80 100644
--- a/packages/qpe-games/labyrinth_0.7.bb
+++ b/packages/qpe-games/labyrinth_0.7.bb
@@ -1,11 +1,11 @@
DESCRIPTION = "A traditional (german?) boardgame"
SECTION = "opie/games"
PRIORITY = "optional"
-MAINTAINER = "none"
LICENSE = "GPL"
AUTHOR = "Helge Plehn"
HOMEPAGE = "http://hexatrolic.i-networx.de/"
APPNAME = "labyrinth"
+PR = "r1"
SRC_URI = "http://handhelds.org/~zecke/oe_packages/labyrinth-0.7-zecke1.tar.gz"
diff --git a/packages/totem/totem_1.0.4.bb b/packages/totem/totem_1.0.4.bb
index 617b4aa9d0..0d86faf9c9 100644
--- a/packages/totem/totem_1.0.4.bb
+++ b/packages/totem/totem_1.0.4.bb
@@ -6,6 +6,7 @@ SECTION = "x11/multimedia"
DESCRIPTION="A GTK2 based media player"
HOMEPAGE="http://www.gnome.org/projects/totem/"
LICENSE="GPL"
+PR = "r1"
SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/totem/1.0/totem-${PV}.tar.gz \
file://include.patch;patch=1 \
@@ -19,7 +20,7 @@ DEPENDS="gtk+ libglade gnome-vfs gconf libxine-x11 libxml2"
inherit autotools
-EXTRA_OECONF="--disable-schemas-install --disable-nvtv --enable-gtk --disable-debug --disable-gstreamer --disable-mozilla"
+EXTRA_OECONF="--disable-schemas-install --disable-nvtv --enable-gtk --disable-debug --disable-gstreamer --disable-mozilla --disable-lirc"
#SELECTED_OPTIMIZATION="-O0 -g"
LDFLAGS_append = " -Wl,--export-dynamic"
diff --git a/packages/tslib/tslib/h2200/tslib.sh b/packages/tslib/tslib/h2200/tslib.sh
index 7fa6492ce0..90d911818b 100644
--- a/packages/tslib/tslib/h2200/tslib.sh
+++ b/packages/tslib/tslib/h2200/tslib.sh
@@ -15,5 +15,7 @@ case `uname -r` in
;;
esac
-export TSLIB_TSDEVICE TSLIB_CONFFILE
+QWS_MOUSE_PROTO=TPanel:${TSLIB_TSDEVICE}
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO
diff --git a/packages/tslib/tslib/h3600/tslib.sh b/packages/tslib/tslib/h3600/tslib.sh
index b07fce0aea..a1f5205c47 100644
--- a/packages/tslib/tslib/h3600/tslib.sh
+++ b/packages/tslib/tslib/h3600/tslib.sh
@@ -11,5 +11,7 @@ case `uname -r` in
;;
esac
-export TSLIB_TSDEVICE TSLIB_CONFFILE
+QWS_MOUSE_PROTO=TPanel:${TSLIB_TSDEVICE}
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO
diff --git a/packages/tslib/tslib/h3900/tslib.sh b/packages/tslib/tslib/h3900/tslib.sh
index 7fa6492ce0..90d911818b 100644
--- a/packages/tslib/tslib/h3900/tslib.sh
+++ b/packages/tslib/tslib/h3900/tslib.sh
@@ -15,5 +15,7 @@ case `uname -r` in
;;
esac
-export TSLIB_TSDEVICE TSLIB_CONFFILE
+QWS_MOUSE_PROTO=TPanel:${TSLIB_TSDEVICE}
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO
diff --git a/packages/tslib/tslib/h6300/tslib.sh b/packages/tslib/tslib/h6300/tslib.sh
index 95e6a2d02b..8b45c66a1f 100644
--- a/packages/tslib/tslib/h6300/tslib.sh
+++ b/packages/tslib/tslib/h6300/tslib.sh
@@ -2,6 +2,7 @@
TSLIB_TSDEVICE=`detect-tsdevice`
TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h6300
+QWS_MOUSE_PROTO=TPanel:${TSLIB_TSDEVICE}
-export TSLIB_TSDEVICE TSLIB_CONFFILE
+export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO
diff --git a/packages/tslib/tslib/ipaq-pxa270/tslib.sh b/packages/tslib/tslib/ipaq-pxa270/tslib.sh
index a3eb096a30..3fba531561 100644
--- a/packages/tslib/tslib/ipaq-pxa270/tslib.sh
+++ b/packages/tslib/tslib/ipaq-pxa270/tslib.sh
@@ -2,5 +2,6 @@
TSLIB_TSDEVICE=`detect-tsdevice`
TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600
+QWS_MOUSE_PROTO=TPanel:${TSLIB_TSDEVICE}
-export TSLIB_TSDEVICE TSLIB_CONFFILE
+export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO
diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb
index 53b4a0217c..72fb979e5e 100644
--- a/packages/tslib/tslib_cvs.bb
+++ b/packages/tslib/tslib_cvs.bb
@@ -1,7 +1,7 @@
SECTION = "base"
DESCRIPTION = "tslib is a touchscreen access library."
PV = "0.0cvs${CVSDATE}"
-PR = "r33"
+PR = "r34"
SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
PACKAGE_ARCH_tslib-conf = "${MACHINE}"
@@ -41,10 +41,7 @@ EXTRA_OECONF_mnci = "--enable-shared --disable-h3600 --enable-input --disable-
EXTRA_OECONF_beagle = "--enable-shared --enable-h3600 --disable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 "
do_stage () {
- oe_libinstall -so -C src libts-0.0 ${STAGING_LIBDIR}
- ln -sf libts-0.0.so ${STAGING_LIBDIR}/libts.so
- install -m 0644 src/tslib.h ${STAGING_INCDIR}/
- install -m 0644 src/tslib-private.h ${STAGING_INCDIR}/
+ autotools_stage_all
}
do_install_prepend () {
diff --git a/packages/udev/udev_084.bb b/packages/udev/udev_084.bb
index 6bafa615d7..1078cc416c 100644
--- a/packages/udev/udev_084.bb
+++ b/packages/udev/udev_084.bb
@@ -13,7 +13,7 @@ include udev.inc
INITSCRIPT_PARAMS = "start 03 S . start 55 0 6 ."
-PR = "r3"
+PR = "r4"
FILES_${PN} += "${base_libdir}"
UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/"
@@ -31,6 +31,7 @@ do_install () {
install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules
install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules
install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules
+ install -m 0644 ${WORKDIR}/links.conf ${D}${sysconfdir}/udev/links.conf
if [ "${UDEV_DEVFS_RULES}" = "1" ]; then
install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules
fi
diff --git a/packages/xserver-common/xserver-common_1.8.bb b/packages/xserver-common/xserver-common_1.8.bb
index 3a298621f4..1925392b80 100644
--- a/packages/xserver-common/xserver-common_1.8.bb
+++ b/packages/xserver-common/xserver-common_1.8.bb
@@ -2,6 +2,8 @@ MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
DESCRIPTION = "Common X11 scripts and support files"
LICENSE = "GPL"
SECTION = "x11"
+PR = "r1"
+
DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
@@ -9,4 +11,5 @@ RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
# we are using a gpe-style Makefile
inherit gpe
-SRC_URI += "file://100dpi.patch;patch=1"
+SRC_URI += "file://100dpi.patch;patch=1 \
+ file://hx4700.patch;patch=1"