From 56026f0f23ccd5b8f2f0b921f080af1e22aff66d Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Wed, 1 Aug 2007 17:21:21 +0000 Subject: prismstumbler: Fix build issue with up to date gpsd. --- .../prismstumbler-0.7.3+0.7.4pre1/fix-includes.patch | 11 +++++++++++ packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb | 5 +++-- 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 packages/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/fix-includes.patch diff --git a/packages/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/fix-includes.patch b/packages/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/fix-includes.patch new file mode 100644 index 0000000000..f041d45baf --- /dev/null +++ b/packages/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/fix-includes.patch @@ -0,0 +1,11 @@ +--- src/daemon/gpsctl.c~ 2007-08-01 19:09:31.000000000 +0200 ++++ src/daemon/gpsctl.c 2007-08-01 19:09:31.000000000 +0200 +@@ -3,6 +3,7 @@ + * Alberto García Hierro + */ + ++#include + #include + #include "gpsctl.h" + + diff --git a/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb b/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb index 3005476e50..86b4df46bf 100644 --- a/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb +++ b/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb @@ -1,5 +1,5 @@ SECTION = "x11/network" -PR = "r2" +PR = "r3" PACKAGES = "prismstumbler prismstumbler-frontend prismstumbler-doc" DESCRIPTION = "Prismstumbler wireless LAN scanner" @@ -11,7 +11,8 @@ RRECOMMENDS = "gpsd" SRC_URI = "http://projects.linuxtogo.org/frs/download.php/14/${PN}-0.7.4pre1.tar.gz \ file://gpsapi.patch;patch=1 \ - file://wireless.patch;patch=1" + file://wireless.patch;patch=1 \ + file://fix-includes.patch;patch=1;pnum=0" S = "${WORKDIR}/${PN}-0.7.4pre1" -- cgit v1.2.3 From 1d413fb78c27b8ec4504cece6a04599080d3f1d9 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Wed, 1 Aug 2007 18:19:33 +0000 Subject: task-gpephone: Add machined, remove some unused bits. --- packages/tasks/task-gpephone.bb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/tasks/task-gpephone.bb b/packages/tasks/task-gpephone.bb index b81338a676..619ac7d5a5 100644 --- a/packages/tasks/task-gpephone.bb +++ b/packages/tasks/task-gpephone.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for GPE Palmtop Environment Phone Edition" -PR = "r5" +PR = "r6" LICENSE = "MIT" ALLOW_EMPTY = "1" @@ -80,16 +80,13 @@ RDEPENDS_gpephone-task-pim = "\ RDEPENDS_gpephone-task-settings = "\ gpe-su \ gpe-conf \ - gpe-clock \ gpe-mixer \ gpe-taskmanager \ - keylaunch \ - minilite" + minilite \ + machined" RDEPENDS_gpephone-task-apps = "\ - gpe-watch \ gpe-what \ - matchbox-panel-hacks \ gpe-scap \ gpe-windowlist" -- cgit v1.2.3 From e1de898546b8cc204403266529bcc56f23fe6980 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Wed, 1 Aug 2007 19:09:00 +0000 Subject: meta-gpe: Switch to new GPE task names. --- packages/meta/meta-gpe.bb | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb index d6e199f6d6..15e9fd1911 100644 --- a/packages/meta/meta-gpe.bb +++ b/packages/meta/meta-gpe.bb @@ -1,14 +1,13 @@ DESCRIPTION = "Meta-package for GPE Palmtop Environment" LICENSE = "MIT" -PR = "r42" +PR = "r43" RDEPENDS = "\ - gpe-base-depends \ - gpe-task-base \ - gpe-task-settings \ - gpe-task-pim \ - gpe-task-apps \ - gpe-task-games \ - gpe-task-connectivity" + task-gpe-base \ + task-gpe-settings \ + task-gpe-pim \ + task-gpe-apps \ + task-gpe-games \ + task-gpe-connectivity" inherit meta -- cgit v1.2.3 From d0cbffc8c9de63fedf6b8861316be3528c5f09a3 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Wed, 1 Aug 2007 19:10:17 +0000 Subject: e-image: Update to use new GPE task names. --- packages/images/e-image.bb | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/packages/images/e-image.bb b/packages/images/e-image.bb index 2f0bef98ef..acd45cd5ae 100644 --- a/packages/images/e-image.bb +++ b/packages/images/e-image.bb @@ -1,15 +1,15 @@ require e-image-core.bb DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager and Tools" -PR = "r5" +PR = "r6" export IMAGE_BASENAME = "e-image" export PACKAGE_INSTALL += "task-e-x11-core \ - gpe-task-pim \ - gpe-task-settings \ - gpe-task-apps \ - gpe-task-connectivity \ - gpe-task-games \ - gpe-task-apps-extra \ + ask-gpe-pim \ + task-gpe-settings \ + task-gpe-apps \ + task-gpe-connectivity \ + task-gpe-games \ + task-apps-extra \ figment \ xhost \ gpe-soundserver \ @@ -23,13 +23,8 @@ export PACKAGE_INSTALL += "task-e-x11-core \ gdk-pixbuf-loader-pnm \ gdk-pixbuf-loader-xbm \ gdk-pixbuf-loader-xpm" -# gdk-pixbuf-loader-pcx \ -# gdk-pixbuf-loader-ico \ -# gdk-pixbuf-loader-ani \ -# gdk-pixbuf-loader-ras \ -# gdk-pixbuf-loader-tga \ -# gdk-pixbuf-loader-wbmp \ -DEPENDS += "task-e-x11-core task-gpe figment xhost gpe-soundserver gpe-confd xauth" +DEPENDS += "task-e-x11-core task-gpe-base task-gpe-pim task-gpe-settings task-gpe-apps task-gpe-connectivity task-gpe-games \ + figment xhost gpe-soundserver gpe-confd xauth" RDEPENDS = "${PACKAGE_INSTALL}" -- cgit v1.2.3 From e2b2bb7b15e1950cccce5cbb16b836a580d848e3 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Wed, 1 Aug 2007 19:10:53 +0000 Subject: gpe-image: Update to use new GPE task names. --- packages/images/gpe-image.bb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/images/gpe-image.bb b/packages/images/gpe-image.bb index 552384c9e6..5a0632ff37 100644 --- a/packages/images/gpe-image.bb +++ b/packages/images/gpe-image.bb @@ -1,20 +1,20 @@ -PR = "r20" +PR = "r21" export IMAGE_BASENAME = "gpe-image" GPE_EXTRA_THEMES = "gpe-theme-industrial" GPE_EXTRA_INSTALL_none = "" -GPE_EXTRA_INSTALL_bigscreen = "gpe-task-games ${GPE_EXTRA_THEMES}" -GPE_EXTRA_INSTALL_smallscreen = "gpe-task-games ${GPE_EXTRA_THEMES}" +GPE_EXTRA_INSTALL_bigscreen = "task-gpe-games ${GPE_EXTRA_THEMES}" +GPE_EXTRA_INSTALL_smallscreen = "task-gpe-games ${GPE_EXTRA_THEMES}" GUI_MACHINE_CLASS ?= "none" GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}" #ship more stuff with devices with >16MB of flash GPE_BIGFLASH_INSTALL := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\ - gpe-task-connectivity \ + task-gpe-connectivity \ gpe-theme-clearlooks \ figment \ ",d)}' @@ -23,15 +23,15 @@ GPE_EXTRA_INSTALL += "${GPE_BIGFLASH_INSTALL}" XSERVER ?= "xserver-kdrive-fbdev" -DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpe" +DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpe-base task-gpe-apps task-gpe-pim task-gpe-settings task-gpe-games" RDEPENDS = "${PACKAGE_INSTALL}" export PACKAGE_INSTALL = "\ ${MACHINE_TASK_PROVIDER} \ - gpe-task-base \ - gpe-task-pim \ - gpe-task-settings \ - gpe-task-apps \ + task-gpe-base \ + task-gpe-pim \ + task-gpe-settings \ + task-gpe-apps \ ${XSERVER} \ ${GPE_EXTRA_INSTALL}" -- cgit v1.2.3 From 394fadfbbe27b53e829489d8e5d462df904e6bd8 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Wed, 1 Aug 2007 19:33:36 +0000 Subject: task-gpe-*: New GPE tasks --- packages/tasks/task-gpe-apps.bb | 24 ++++++++++++++++++++ packages/tasks/task-gpe-base.bb | 39 +++++++++++++++++++++++++++++++++ packages/tasks/task-gpe-connectivity.bb | 9 ++++++++ packages/tasks/task-gpe-desktopapps.bb | 13 +++++++++++ packages/tasks/task-gpe-games.bb | 13 +++++++++++ packages/tasks/task-gpe-pim.bb | 18 +++++++++++++++ packages/tasks/task-gpe-sectest.bb | 17 ++++++++++++++ packages/tasks/task-gpe-settings.bb | 22 +++++++++++++++++++ packages/tasks/task-gpe-web.bb | 10 +++++++++ 9 files changed, 165 insertions(+) create mode 100644 packages/tasks/task-gpe-apps.bb create mode 100644 packages/tasks/task-gpe-base.bb create mode 100644 packages/tasks/task-gpe-connectivity.bb create mode 100644 packages/tasks/task-gpe-desktopapps.bb create mode 100644 packages/tasks/task-gpe-games.bb create mode 100644 packages/tasks/task-gpe-pim.bb create mode 100644 packages/tasks/task-gpe-sectest.bb create mode 100644 packages/tasks/task-gpe-settings.bb create mode 100644 packages/tasks/task-gpe-web.bb diff --git a/packages/tasks/task-gpe-apps.bb b/packages/tasks/task-gpe-apps.bb new file mode 100644 index 0000000000..5aee575b75 --- /dev/null +++ b/packages/tasks/task-gpe-apps.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Application task package for GPE Palmtop Environment" +PR = "r5" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +RDEPENDS = "\ + gpe-edit \ + gpe-gallery \ + gpe-calculator \ + gpe-clock \ + gpe-plucker \ + gpe-terminal \ + gpe-watch \ + gpe-what \ + matchbox-panel-hacks \ + gpe-aerial \ + rosetta \ + gpe-scap \ + gpe-windowlist \ + gpe-filemanager \ + gpe-soundbite \ + mbmerlin \ + starling" + diff --git a/packages/tasks/task-gpe-base.bb b/packages/tasks/task-gpe-base.bb new file mode 100644 index 0000000000..821142949a --- /dev/null +++ b/packages/tasks/task-gpe-base.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "Base task package for GPE Palmtop Environment" +PR = "r5" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +RDEPENDS = "\ + diet-x11 \ + virtual/xserver \ + gpe-bootsplash \ + bluez-utils-dbus \ + matchbox \ + xcursor-transparent-theme \ + rxvt-unicode \ + gtk2-theme-angelistic \ + matchbox-themes-gtk \ + xst \ + xhost \ + xrdb \ + gpe-soundserver \ + gpe-dm \ + gpe-login \ + gpe-session-scripts \ + gpe-icons \ + gpe-confd \ + gpe-autostarter \ + startup-monitor \ + libgtkstylus \ + suspend-desktop \ + teleport \ + xauth \ + gdk-pixbuf-loader-png \ + gdk-pixbuf-loader-xpm \ + gdk-pixbuf-loader-jpeg \ + pango-module-basic-x \ + pango-module-basic-fc \ + ttf-dejavu-sans \ + ttf-dejavu-sans-mono \ + ttf-dejavu-serif" + diff --git a/packages/tasks/task-gpe-connectivity.bb b/packages/tasks/task-gpe-connectivity.bb new file mode 100644 index 0000000000..678afb8c1a --- /dev/null +++ b/packages/tasks/task-gpe-connectivity.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "Connectivity task packages for GPE Palmtop Environment" +PR = "r5" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +RDEPENDS = "\ + gpe-mini-browser \ + gpe-irc" + diff --git a/packages/tasks/task-gpe-desktopapps.bb b/packages/tasks/task-gpe-desktopapps.bb new file mode 100644 index 0000000000..346cd70353 --- /dev/null +++ b/packages/tasks/task-gpe-desktopapps.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Additional desktop applications package for GPE Palmtop Environment" +PR = "r5" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +RDEPENDS = "\ + sylpheed \ + firefox \ + thunderbird \ + galculator \ + gnumeric \ + gpdf" + diff --git a/packages/tasks/task-gpe-games.bb b/packages/tasks/task-gpe-games.bb new file mode 100644 index 0000000000..6076f5ba70 --- /dev/null +++ b/packages/tasks/task-gpe-games.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Games task package for GPE Palmtop Environment" +PR = "r5" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +RDEPENDS = "\ + gpe-go \ + gpe-lights \ + gpe-othello \ + gpe-tetris \ + gsoko \ + xdemineur" + diff --git a/packages/tasks/task-gpe-pim.bb b/packages/tasks/task-gpe-pim.bb new file mode 100644 index 0000000000..a81b5a9a34 --- /dev/null +++ b/packages/tasks/task-gpe-pim.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "PIM task packages for GPE Palmtop Environment" +PR = "r5" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +RDEPENDS_gpe-task-pim = "\ + gpe-timesheet \ + gpe-todo \ + gpe-calendar \ + gpe-sketchbook \ + gpe-contacts \ + gpe-synctool \ + gpesyncd \ + miniclipboard" + +# broken gpe-today \ + + diff --git a/packages/tasks/task-gpe-sectest.bb b/packages/tasks/task-gpe-sectest.bb new file mode 100644 index 0000000000..75b525b618 --- /dev/null +++ b/packages/tasks/task-gpe-sectest.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Security testing task packages for GPE Palmtop Environment" +PR = "r5" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +RDEPENDS = "\ + nmap \ + ettercap \ + stunnel \ + curl \ + dsniff \ + prismstumbler \ + tcpdump \ + kismet \ + hydra \ + thcrut" + diff --git a/packages/tasks/task-gpe-settings.bb b/packages/tasks/task-gpe-settings.bb new file mode 100644 index 0000000000..ddfcb282f1 --- /dev/null +++ b/packages/tasks/task-gpe-settings.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Settings task package for GPE Palmtop Environment" +PR = "r5" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +RDEPENDS = "\ + gpe-mininet \ + gpe-bluetooth \ + gpe-beam \ + matchbox-panel-manager \ + gpe-su \ + gpe-conf \ + gpe-clock \ + gpe-mixer \ + gpe-package \ + gpe-shield \ + gpe-taskmanager \ + keylaunch \ + minilite \ + minimix \ + xmonobut" + diff --git a/packages/tasks/task-gpe-web.bb b/packages/tasks/task-gpe-web.bb new file mode 100644 index 0000000000..247165ba9d --- /dev/null +++ b/packages/tasks/task-gpe-web.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "Additional web task packages for GPE Palmtop Environment" +PR = "r5" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + + +RDEPENDS = "\ + pidgin \ + minimo" + -- cgit v1.2.3 From af7ad30b51ec8deb28e90df737c099a9f64a2ad5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 1 Aug 2007 20:01:47 +0000 Subject: matchbox-panel-hacks: patch xrandr-panel-app.sh to (hopefully) work with xrandr 1.3. should close #2685 --- .../matchbox-panel-hacks-0.3-1/xrandr-panelapp.sh | 11 +++++------ packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr-panelapp.sh b/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr-panelapp.sh index d17c805ffc..fbf88d6d08 100755 --- a/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr-panelapp.sh +++ b/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr-panelapp.sh @@ -1,9 +1,8 @@ #!/bin/sh -if [ -n "$(xrandr | grep rotation | grep left)" ] -then -xrandr -o normal -xmodmap /etc/X11/xmodmap-portrait +if [ -n "$(xrandr | grep default | grep 'left\ (')" ] ; then + xrandr -o normal + xmodmap /etc/X11/xmodmap-portrait else -xrandr -o left -xmodmap /etc/X11/xmodmap-left + xrandr -o left + xmodmap /etc/X11/xmodmap-left fi diff --git a/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb b/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb index f5c1209255..2fd7926707 100644 --- a/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb +++ b/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb @@ -5,7 +5,7 @@ PRIORITY = "optional" DEPENDS = "matchbox xmodmap" -PR = "r6" +PR = "r7" SRC_URI = "file://xrandr-panelapp.sh \ file://xrandr-panelapp.desktop \ -- cgit v1.2.3 From e881e55b2357af3786cdfaed5003f574f25d0ac1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 1 Aug 2007 20:02:42 +0000 Subject: eglibc: add svn recipe for eglibc * this is WIP, but it completes do_compile * Need to bother Khem about how to do localegen the eglibc way --- packages/glibc/eglibc_svn.bb | 87 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 packages/glibc/eglibc_svn.bb diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb new file mode 100644 index 0000000000..d9ff3871c0 --- /dev/null +++ b/packages/glibc/eglibc_svn.bb @@ -0,0 +1,87 @@ +require glibc.inc + +DEFAULT_PREFERENCE = "-1" + +PV = "2.6+svnr${SRCREV}" +SRC_URI = "svn://svn.eglibc.org;module=trunk \ + " +S = "${WORKDIR}/trunk/libc" +B = "${WORKDIR}/build-${TARGET_SYS}" + +#PACKAGES_DYNAMIC = "libc6*" +#RPROVIDES_${PN}-dev = "libc6-dev" + +# the -isystem in bitbake.conf screws up glibc do_stage +BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include" +TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include" + +GLIBC_ADDONS ?= "ports,nptl,libidn" + +GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN" + +# +# For now, we will skip building of a gcc package if it is a uclibc one +# and our build is not a uclibc one, and we skip a glibc one if our build +# is a uclibc build. +# +# See the note in gcc/gcc_3.4.0.oe +# + +python __anonymous () { + import bb, re + uc_os = (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None) + if uc_os: + raise bb.parse.SkipPackage("incompatible with target %s" % + bb.data.getVar('TARGET_OS', d, 1)) +} + + +EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ + --without-cvs --disable-profile --disable-debug --without-gd \ + --enable-clocale=gnu \ + --enable-add-ons=${GLIBC_ADDONS} \ + --with-headers=${STAGING_INCDIR} \ + --without-selinux \ + ${GLIBC_EXTRA_OECONF}" + +EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}" + +do_configure_prepend() { + if test -d ${WORKDIR}/trunk/ports ; then + mv ${WORKDIR}/trunk/ports ${S}/ + fi +} + +do_configure () { +# override this function to avoid the autoconf/automake/aclocal/autoheader +# calls for now +# don't pass CPPFLAGS into configure, since it upsets the kernel-headers +# version check and doesn't really help with anything + if [ -z "`which rpcgen`" ]; then + echo "rpcgen not found. Install glibc-devel." + exit 1 + fi + (cd ${S} && gnu-configize) || die "failure in running gnu-configize" + find ${WORKDIR} -name "configure" | xargs touch + CPPFLAGS="" oe_runconf +} + +rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \ + yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \ + rusers.x spray.x nfs_prot.x rquota.x key_prot.x" + +do_compile () { + # -Wl,-rpath-link /lib in LDFLAGS can cause breakage if another glibc is in staging + unset LDFLAGS + base_do_compile + ( + cd ${S}/sunrpc/rpcsvc + for r in ${rpcsvc}; do + h=`echo $r|sed -e's,\.x$,.h,'` + rpcgen -h $r -o $h || oewarn "unable to generate header for $r" + done + ) +} + + +require glibc-package.bbclass -- cgit v1.2.3