summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/openomap.conf (renamed from packages/gpe-dm/gpe-dm/remove-apm_bios.patch)0
-rw-r--r--conf/machine/omap1610h2.conf1
-rw-r--r--packages/gnupg/gnupg2.inc84
-rw-r--r--packages/gnupg/gnupg2_1.9.15.bb3
-rw-r--r--packages/gpe-dm/files/source-xsession-scripts.patch0
-rw-r--r--packages/gpe-dm/gpe-dm_0.40.bb13
-rw-r--r--packages/gpe-dm/gpe-dm_0.41.bb13
-rw-r--r--packages/gpe-dm/gpe-dm_0.42.bb13
-rw-r--r--packages/gpe-dm/gpe-dm_0.43.bb13
-rw-r--r--packages/gpe-dm/gpe-dm_0.44.bb14
-rw-r--r--packages/gpe-login/files/user-own-collie-devs.patch42
-rw-r--r--packages/gpe-login/gpe-login_0.75.bb5
-rw-r--r--packages/gpe-session-scripts/files/collie.xmodmap5
-rw-r--r--packages/keylaunch/files/collie/keylaunchrc0
-rw-r--r--packages/keylaunch/files/keylaunchrc0
-rw-r--r--packages/keylaunch/keylaunch_2.0.7.bb7
-rw-r--r--packages/libgtkstylus/libgtkstylus_0.3.bb6
-rw-r--r--packages/matchbox-wm/matchbox-wm/collie/kbdconfig0
-rw-r--r--packages/matchbox-wm/matchbox-wm/kbdconfig0
-rw-r--r--packages/matchbox-wm/matchbox-wm/simpad/kbdconfig0
-rw-r--r--packages/matchbox-wm/matchbox-wm_0.9.3.bb20
-rw-r--r--packages/matchbox-wm/matchbox-wm_svn.bb19
-rw-r--r--packages/meta/gpe-image.bb4
-rw-r--r--packages/meta/meta-gpe.bb5
-rw-r--r--packages/sudo/sudo.inc20
-rw-r--r--packages/sudo/sudo_1.6.8p6.bb2
26 files changed, 235 insertions, 54 deletions
diff --git a/packages/gpe-dm/gpe-dm/remove-apm_bios.patch b/conf/distro/openomap.conf
index e69de29bb2..e69de29bb2 100644
--- a/packages/gpe-dm/gpe-dm/remove-apm_bios.patch
+++ b/conf/distro/openomap.conf
diff --git a/conf/machine/omap1610h2.conf b/conf/machine/omap1610h2.conf
index 51c9af2126..769c08cc70 100644
--- a/conf/machine/omap1610h2.conf
+++ b/conf/machine/omap1610h2.conf
@@ -7,6 +7,7 @@ IPKG_ARCHS = "all arm armv5te ${MACHINE}"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
+MODUTILS = "26"
BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel modutils-collateral"
BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
diff --git a/packages/gnupg/gnupg2.inc b/packages/gnupg/gnupg2.inc
index e69de29bb2..4013581aea 100644
--- a/packages/gnupg/gnupg2.inc
+++ b/packages/gnupg/gnupg2.inc
@@ -0,0 +1,84 @@
+SECTION = "console/utils"
+DESCRIPTION = "gnupg - GNU privacy guard - development version"
+HOMEPAGE = "http://www.gnupg.org/"
+LICENSE = "GPLv2"
+MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
+# DEPENDS = "zlib libgpg-error libgcrypt libassuan ksba opensc"
+DEPENDS = "zlib libgpg-error libgcrypt libassuan"
+
+inherit autotools gettext
+
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-${PV}.tar.bz2"
+S = "${WORKDIR}/gnupg-${PV}"
+libexecdir := "${libexecdir}/gnupg2"
+FILES_${PN} += "${datadir}/gnupg"
+
+# NOTE: gpgsm and scdaemon binaries aren't buildable if you dont have libksba. -CL
+# --with-ksba-prefix=${STAGING_LIBDIR}/..
+
+# NOTE: opensc is needed by the scdaemon binary. if you don't have opensc, it can
+# only build a limited scdaemon. -CL
+# --with-opensc-prefix=${STAGING_LIBDIR}/..
+
+# NOTE: given those facts, the current build will disable scdaemon and gpgsm.
+# Threads are disabled currently to avoid the pth dependency. -CL
+
+EXTRA_OECONF = "--disable-ldap \
+ --with-zlib=${STAGING_LIBDIR}/.. \
+ --with-gpg-error-prefix=${STAGING_BINDIR}/.. \
+ --with-libgcrypt-prefix=${STAGING_BINDIR}/.. \
+ --with-libassuan-prefix=${STAGING_BINDIR}/.. \
+ --with-pth-prefix=${STAGING_BINDIR}/.. \
+ --with-opensc-prefix=${STAGING_BINDIR}/.. \
+ --with-ksba-prefix=${STAGING_BINDIR}/.. \
+ --disable-threads \
+ --disable-gpgsm \
+ --disable-scdaemon"
+
+# Bypass the tests
+EXTRA_OEMAKE += "'TESTS_ENVIRONMENT=/bin/true'"
+
+# --disable-gpg do not build the gpg program
+# --disable-gpgsm do not build the gpgsm program
+# --disable-agent do not build the agent program
+# --disable-scdaemon do not build the scdaemon program
+# --enable-agent-only build only the gpg-agent
+# --disable-exec disable all external program execution
+# --disable-photo-viewers disable photo ID viewers
+# --disable-keyserver-helpers disable all external keyserver support
+# --disable-ldap disable LDAP keyserver interface
+# --disable-hkp disable HKP keyserver interface
+# --disable-mailto disable email keyserver interface
+# --disable-keyserver-path disable the exec-path option for keyserver helpers
+# --disable-largefile omit support for large files
+# --disable-threads allow building without Pth support
+# --disable-dns-srv disable the use of DNS SRV in HKP
+# --disable-nls do not use Native Language Support
+# --disable-rpath do not hardcode runtime library paths
+# --disable-regex do not handle regular expressions in trust sigs
+# --with-agent-pgm=PATH Use PATH as the default for the agent)
+# --with-pinentry-pgm=PATH Use PATH as the default for the pinentry)
+# --with-scdaemon-pgm=PATH Use PATH as the default for the scdaemon)
+# --with-dirmngr-pgm=PATH Use PATH as the default for the dirmngr)
+# --with-protect-tool-pgm=PATH Use PATH as the default for the protect-tool)
+# --with-photo-viewer=FIXED_VIEWER set a fixed photo ID viewer
+# --with-capabilities use linux capabilities default=no
+# --with-gpg-error-prefix=PFX
+# prefix where GPG Error is installed (optional)
+# --with-libgcrypt-prefix=PFX
+# prefix where LIBGCRYPT is installed (optional)
+# --with-libassuan-prefix=PFX
+# prefix where LIBASSUAN is installed (optional)
+# --with-ksba-prefix=PFX prefix where KSBA is installed (optional)
+# --with-opensc-prefix=PFX
+# prefix where OpenSC is installed (optional)
+# --with-pth-prefix=PFX prefix where GNU Pth is installed (optional)
+# --with-mailprog=NAME use "NAME -t" for mail transport
+# --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
+# --without-libiconv-prefix don't search for libiconv in includedir and libdir
+# --with-included-gettext use the GNU gettext library included here
+# --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
+# --without-libintl-prefix don't search for libintl in includedir and libdir
+# --with-included-regex use the included GNU regex library
+# --with-zlib=DIR use libz in DIR
+# --with-pkits-tests run the PKITS based tests
diff --git a/packages/gnupg/gnupg2_1.9.15.bb b/packages/gnupg/gnupg2_1.9.15.bb
index e69de29bb2..fc24adde31 100644
--- a/packages/gnupg/gnupg2_1.9.15.bb
+++ b/packages/gnupg/gnupg2_1.9.15.bb
@@ -0,0 +1,3 @@
+include gnupg2.inc
+
+PR = "r2"
diff --git a/packages/gpe-dm/files/source-xsession-scripts.patch b/packages/gpe-dm/files/source-xsession-scripts.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpe-dm/files/source-xsession-scripts.patch
diff --git a/packages/gpe-dm/gpe-dm_0.40.bb b/packages/gpe-dm/gpe-dm_0.40.bb
index e69de29bb2..556e4b5991 100644
--- a/packages/gpe-dm/gpe-dm_0.40.bb
+++ b/packages/gpe-dm/gpe-dm_0.40.bb
@@ -0,0 +1,13 @@
+LICENSE = "GPL"
+inherit gpe update-rc.d
+
+DESCRIPTION = "GPE Desktop Manager"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "glib-2.0"
+PR = "r2"
+
+INITSCRIPT_NAME = "gpe-dm"
+INITSCRIPT_PARAMS = "defaults 99"
+
diff --git a/packages/gpe-dm/gpe-dm_0.41.bb b/packages/gpe-dm/gpe-dm_0.41.bb
index e69de29bb2..9429417c84 100644
--- a/packages/gpe-dm/gpe-dm_0.41.bb
+++ b/packages/gpe-dm/gpe-dm_0.41.bb
@@ -0,0 +1,13 @@
+LICENSE = "GPL"
+inherit gpe update-rc.d
+
+DESCRIPTION = "GPE Desktop Manager"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "glib-2.0"
+PR = "r1"
+
+INITSCRIPT_NAME = "gpe-dm"
+INITSCRIPT_PARAMS = "defaults 99"
+
diff --git a/packages/gpe-dm/gpe-dm_0.42.bb b/packages/gpe-dm/gpe-dm_0.42.bb
index e69de29bb2..9429417c84 100644
--- a/packages/gpe-dm/gpe-dm_0.42.bb
+++ b/packages/gpe-dm/gpe-dm_0.42.bb
@@ -0,0 +1,13 @@
+LICENSE = "GPL"
+inherit gpe update-rc.d
+
+DESCRIPTION = "GPE Desktop Manager"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "glib-2.0"
+PR = "r1"
+
+INITSCRIPT_NAME = "gpe-dm"
+INITSCRIPT_PARAMS = "defaults 99"
+
diff --git a/packages/gpe-dm/gpe-dm_0.43.bb b/packages/gpe-dm/gpe-dm_0.43.bb
index e69de29bb2..9429417c84 100644
--- a/packages/gpe-dm/gpe-dm_0.43.bb
+++ b/packages/gpe-dm/gpe-dm_0.43.bb
@@ -0,0 +1,13 @@
+LICENSE = "GPL"
+inherit gpe update-rc.d
+
+DESCRIPTION = "GPE Desktop Manager"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "glib-2.0"
+PR = "r1"
+
+INITSCRIPT_NAME = "gpe-dm"
+INITSCRIPT_PARAMS = "defaults 99"
+
diff --git a/packages/gpe-dm/gpe-dm_0.44.bb b/packages/gpe-dm/gpe-dm_0.44.bb
index e69de29bb2..6ed8e68ef8 100644
--- a/packages/gpe-dm/gpe-dm_0.44.bb
+++ b/packages/gpe-dm/gpe-dm_0.44.bb
@@ -0,0 +1,14 @@
+LICENSE = "GPL"
+inherit gpe update-rc.d
+
+DESCRIPTION = "GPE Desktop Manager"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "glib-2.0"
+PR = "r1"
+
+INITSCRIPT_NAME = "gpe-dm"
+INITSCRIPT_PARAMS = "defaults 99"
+
+SRC_URI += " file://source-xsession-scripts.patch;patch=1"
diff --git a/packages/gpe-login/files/user-own-collie-devs.patch b/packages/gpe-login/files/user-own-collie-devs.patch
index c45fa06369..ea2afd8583 100644
--- a/packages/gpe-login/files/user-own-collie-devs.patch
+++ b/packages/gpe-login/files/user-own-collie-devs.patch
@@ -1,33 +1,25 @@
-diff -urNd ../gpe-login-0.73-r1/gpe-login-0.73/X11/gpe-login.pre-session gpe-login-0.73/X11/gpe-login.pre-session
---- ../gpe-login-0.73-r1/gpe-login-0.73/X11/gpe-login.pre-session 2004-01-17 11:24:23.000000000 +0000
-+++ gpe-login-0.73/X11/gpe-login.pre-session 2004-09-17 13:07:56.000000000 +0100
-@@ -6,10 +6,18 @@
- chown $USER /dev/sound/dsp
+--- ../gpe-login-0.75-r3/gpe-login-0.75/X11/gpe-login.pre-session 2005-02-24 02:24:33 +00:00
++++ gpe-login-0.75/X11/gpe-login.pre-session 2005-02-24 02:28:14 +00:00
+@@ -30,13 +30,19 @@
+ chown $USER /dev/touchscreen/0
fi
-+if [ -e /dev/dsp ]; then
-+chown $USER /dev/dsp
+-if [ -e /dev/collie-fl ]; then
++if [ -e /dev/misc/buzzer ]; then
++chown $USER /dev/misc/buzzer
+fi
+
- if [ -e /dev/sound/mixer ]; then
- chown $USER /dev/sound/mixer
++# The following added for collie
++if [ -e /dev/sharp_fl ]; then
+ chown $USER /dev/sharp_fl
fi
-+if [ -e /dev/mixer ]; then
-+chown $USER /dev/mixer
-+fi
-+
- if [ -e /dev/touchscreen/0raw ]; then
- chown $USER /dev/touchscreen/0raw
- fi
-@@ -18,6 +26,10 @@
- chown $USER /dev/touchscreen/0
+-if [ -e /dev/misc/buzzer ]; then
+-chown $USER /dev/misc/buzzer
++if [ -e /dev/fb0 ]; then
++chown $USER /dev/fb0
fi
++# collie bits finished
-+if [ -e /dev/collie-fl ]; then
-+chown $USER /dev/sharp_fl
-+fi
-+
- if [ -e /dev/misc/buzzer ]; then
- chown $USER /dev/misc/buzzer
- fi
+ # check for ramdisk location
+ if [ -d /mnt/ramfs ]; then
diff --git a/packages/gpe-login/gpe-login_0.75.bb b/packages/gpe-login/gpe-login_0.75.bb
index 6de07d8e6a..ac432e5edf 100644
--- a/packages/gpe-login/gpe-login_0.75.bb
+++ b/packages/gpe-login/gpe-login_0.75.bb
@@ -8,6 +8,7 @@ MAINTAINER = "Philip Blundell <pb@handhelds.org>"
DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
RDEPENDS = "xkbd"
RPROVIDES = "gpe-session-starter"
-PR = "r2"
+PR = "r3"
-SRC_URI += "file://pre-session.patch;patch=1"
+SRC_URI += "file://pre-session.patch;patch=1 \
+ file://user-own-collie-devs.patch;patch=1"
diff --git a/packages/gpe-session-scripts/files/collie.xmodmap b/packages/gpe-session-scripts/files/collie.xmodmap
index e69de29bb2..5c0b39dc88 100644
--- a/packages/gpe-session-scripts/files/collie.xmodmap
+++ b/packages/gpe-session-scripts/files/collie.xmodmap
@@ -0,0 +1,5 @@
+keycode 96 = XF86Calendar
+keycode 97 = telephone
+keycode 48 = XF86Start
+keycode 98 = XF86Mail
+keycode 117 = XF86PowerDown
diff --git a/packages/keylaunch/files/collie/keylaunchrc b/packages/keylaunch/files/collie/keylaunchrc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keylaunch/files/collie/keylaunchrc
diff --git a/packages/keylaunch/files/keylaunchrc b/packages/keylaunch/files/keylaunchrc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keylaunch/files/keylaunchrc
diff --git a/packages/keylaunch/keylaunch_2.0.7.bb b/packages/keylaunch/keylaunch_2.0.7.bb
index a4011e13ed..86e0bb6a46 100644
--- a/packages/keylaunch/keylaunch_2.0.7.bb
+++ b/packages/keylaunch/keylaunch_2.0.7.bb
@@ -9,7 +9,12 @@ DESCRIPTION = "A small utility for binding commands to a hot key.\
computers. You can connect each key to a program of your choice; if the\
program is already running, keylaunch can bring its window to the front\
rather than just running another copy."
+PR = "r1"
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz"
+SRC_URI += " file://keylaunchrc"
+
+do_install_prepend () {
+ install ${WORKDIR}/keylaunchrc ${S}/keylaunchrc
+}
export CVSBUILD=no
diff --git a/packages/libgtkstylus/libgtkstylus_0.3.bb b/packages/libgtkstylus/libgtkstylus_0.3.bb
index 6f26a2ed0e..a95e94bf81 100644
--- a/packages/libgtkstylus/libgtkstylus_0.3.bb
+++ b/packages/libgtkstylus/libgtkstylus_0.3.bb
@@ -4,7 +4,7 @@ MAINTAINER = "Philip Blundell <pb@handhelds.org>"
DEPENDS = "gtk+"
LICENSE = "LGPL"
FILES_${PN} = "/etc ${libdir}/gtk-2.0"
-PR = "r1"
+PR = "r3"
inherit autotools
@@ -13,7 +13,7 @@ SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2 \
file://gtkstylus.sh"
do_install_append() {
- install -d ${D}${sysconfdir}/profile.d
- install ${WORKDIR}/gtkstylus.sh ${D}${sysconfdir}/profile.d/
+ install -d ${D}/${sysconfdir}/X11/Xsession.d
+ install -m 755 ${WORKDIR}/gtkstylus.sh ${D}/${sysconfdir}/X11/Xsession.d/45gtkstylus
}
diff --git a/packages/matchbox-wm/matchbox-wm/collie/kbdconfig b/packages/matchbox-wm/matchbox-wm/collie/kbdconfig
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-wm/matchbox-wm/collie/kbdconfig
diff --git a/packages/matchbox-wm/matchbox-wm/kbdconfig b/packages/matchbox-wm/matchbox-wm/kbdconfig
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-wm/matchbox-wm/kbdconfig
diff --git a/packages/matchbox-wm/matchbox-wm/simpad/kbdconfig b/packages/matchbox-wm/matchbox-wm/simpad/kbdconfig
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-wm/matchbox-wm/simpad/kbdconfig
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.3.bb b/packages/matchbox-wm/matchbox-wm_0.9.3.bb
index 9bf7be1e69..11447fe78a 100644
--- a/packages/matchbox-wm/matchbox-wm_0.9.3.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.9.3.bb
@@ -3,14 +3,15 @@ DESCRIPTION = "Matchbox window manager"
LICENSE = "GPL"
DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
RDEPENDS = "matchbox-common"
-PR = "r1"
+PR = "r2"
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz"
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz \
+ file://kbdconfig"
S = "${WORKDIR}/matchbox-window-manager-${PV}"
-inherit autotools pkgconfig
+inherit autotools pkgconfig update-alternatives
FILES_${PN} = "${bindir} \
${datadir}/matchbox \
@@ -19,13 +20,14 @@ FILES_${PN} = "${bindir} \
${datadir}/themes/Default/matchbox \
${datadir}/themes/MBOpus/matchbox"
-EXTRA_OECONF = "--enable-composite --enable-startup-notification --disable-xrm"
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PATH = "${bindir}/matchbox-session"
+ALTERNATIVE_PRIORITY = "10"
-pkg_postinst() {
-update-alternatives --install ${bindir}/x-window-manager x-window-manager ${bindir}/matchbox-session 10
-}
+EXTRA_OECONF = "--enable-composite --enable-startup-notification --disable-xrm"
-pkg_postrm() {
-update-alternatives --remove x-window-manager ${bindir}/matchbox-session
+do_install_prepend() {
+ install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig
}
diff --git a/packages/matchbox-wm/matchbox-wm_svn.bb b/packages/matchbox-wm/matchbox-wm_svn.bb
index 606e3ebc01..fdf38d6e68 100644
--- a/packages/matchbox-wm/matchbox-wm_svn.bb
+++ b/packages/matchbox-wm/matchbox-wm_svn.bb
@@ -4,13 +4,20 @@ LICENSE = "GPL"
DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
RDEPENDS = "matchbox-common"
PV = "0.9cvs${CVSDATE}"
+PR = "r1"
DEFAULT_PREFERENCE = "-1"
-SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager;proto=http"
+SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager;proto=http \
+ file://kbdconfig"
S = "${WORKDIR}/matchbox-window-manager"
-inherit autotools pkgconfig
+inherit autotools pkgconfig update-alternatives
+
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PATH = "${bindir}/matchbox-session"
+ALTERNATIVE_PRIORITY = "10"
FILES_${PN} = "${bindir} \
${datadir}/matchbox \
@@ -21,11 +28,7 @@ FILES_${PN} = "${bindir} \
EXTRA_OECONF = "--enable-composite --enable-startup-notification --disable-xrm"
-pkg_postinst() {
-update-alternatives --install ${bindir}/x-window-manager x-window-manager ${bindir}/matchbox-session 10
-}
-
-pkg_postrm() {
-update-alternatives --remove x-window-manager ${bindir}/matchbox-session
+do_install_prepend() {
+ install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig
}
diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb
index 8bf03689df..ed54d71177 100644
--- a/packages/meta/gpe-image.bb
+++ b/packages/meta/gpe-image.bb
@@ -4,7 +4,7 @@ FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/${D
gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11"
-PR = "r11"
+PR = "r12"
export IMAGE_BASENAME = "gpe-image"
@@ -18,7 +18,7 @@ GPE_EXTRA_THEMES = "gtk-theme-industrial matchbox-themes-extra-industrial"
#GPE_EXTRA_DEPENDS_bigscreen = "firefox linphone"
#GPE_EXTRA_INSTALL_bigscreen = "firefox linphone"
GPE_EXTRA_DEPENDS_bigscreen = "minimo figment"
-GPE_EXTRA_INSTALL_bigscreen = "minimo figment gpe-task-games ${GPE_EXTRA_THEMES}"
+GPE_EXTRA_INSTALL_bigscreen = "minimo figment gpe-task-games ${GPE_EXTRA_THEMES} gpe-appmgr"
GPE_EXTRA_DEPENDS_smallscreen = "minimo figment linphone-hh"
GPE_EXTRA_INSTALL_smallscreen = "minimo figment linphone-hh gpe-task-games ${GPE_EXTRA_THEMES}"
diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb
index bb02c26c9d..3c1bce49d2 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
DESCRIPTION = "Meta-package for GPE Palmtop Environment"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r35"
+PR = "r36"
ALLOW_EMPTY = 1
@@ -31,7 +31,6 @@ gpe-task-base = "\
gpe-autostarter \
gpe-bootsplash \
libgtkstylus \
- gpe-appmgr \
detect-stylus \
teleport \
xauth"
@@ -101,6 +100,6 @@ gpe-task-games = "\
RDEPENDS_gpe-task-games := "${gpe-task-games}"
DEPENDS += " ${gpe-task-games}"
-DEPENDS += "matchbox-themes-extra"
+DEPENDS += "gpe-appmgr matchbox-themes-extra"
LICENSE = MIT
diff --git a/packages/sudo/sudo.inc b/packages/sudo/sudo.inc
index e69de29bb2..0cd18454ab 100644
--- a/packages/sudo/sudo.inc
+++ b/packages/sudo/sudo.inc
@@ -0,0 +1,20 @@
+SECTION = "base"
+DESCRIPTION = "Sudo (superuser do) allows a system \
+administrator to give certain users (or groups of \
+users) the ability to run some (or all) commands \
+as root while logging all commands and arguments."
+LICENSE = "sudo"
+HOMEPAGE = "http://www.courtesan.com/sudo/"
+PRIORITY = "optional"
+SECTION = "admin"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-env-editor"
+
+do_configure_prepend () {
+ rm -f acsite.m4
+ if [ ! -e acinclude.m4 ]; then
+ cat aclocal.m4 > acinclude.m4
+ fi
+}
diff --git a/packages/sudo/sudo_1.6.8p6.bb b/packages/sudo/sudo_1.6.8p6.bb
index 5b2f3716f5..53cd9e4821 100644
--- a/packages/sudo/sudo_1.6.8p6.bb
+++ b/packages/sudo/sudo_1.6.8p6.bb
@@ -5,4 +5,4 @@ SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
file://noexec-link.patch;patch=1"
include sudo.inc
-PR = "r1"
+PR = "r2"