From 83c19ae31e95b429c447b68d6f8267e39a83f0f2 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 10 Sep 2008 16:31:50 +0200 Subject: e-wm: Fix the DESCRIPTION as of https://docs.openmoko.org/trac/ticket/1894 --- packages/e17/e-wm_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/e17/e-wm_svn.bb b/packages/e17/e-wm_svn.bb index e16cad051d..9fbdbd5377 100644 --- a/packages/e17/e-wm_svn.bb +++ b/packages/e17/e-wm_svn.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "The Enlightenment Window Mananger Version 17" +DESCRIPTION = "The Enlightenment Window Manager Version 17" DEPENDS = "eet evas ecore edje efreet edbus" LICENSE = "MIT BSD" PV = "0.16.999.043+svnr${SRCREV}" -- cgit v1.2.3 From f7123c9a6498d3c528b50c4937f4f03d0f080e84 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 31 Mar 2008 15:54:06 +0000 Subject: e-wm: Start e with optional arguments we get from a config file --- packages/e17/e-wm/Xsession.d/98enlightenment | 7 ++++++- packages/e17/e-wm_svn.bb | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/e17/e-wm/Xsession.d/98enlightenment b/packages/e17/e-wm/Xsession.d/98enlightenment index 7913888438..7d472fa76f 100644 --- a/packages/e17/e-wm/Xsession.d/98enlightenment +++ b/packages/e17/e-wm/Xsession.d/98enlightenment @@ -1,3 +1,8 @@ #!/bin/sh -exec enlightenment_start +E_PROFILE="" +if [ -r /etc/enlightenment/default_profile ]; then + . /etc/enlightenment/default_profile +fi + +exec enlightenment_start $E_PROFILE diff --git a/packages/e17/e-wm_svn.bb b/packages/e17/e-wm_svn.bb index 9fbdbd5377..acbee85a70 100644 --- a/packages/e17/e-wm_svn.bb +++ b/packages/e17/e-wm_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The Enlightenment Window Manager Version 17" DEPENDS = "eet evas ecore edje efreet edbus" LICENSE = "MIT BSD" PV = "0.16.999.043+svnr${SRCREV}" -PR = "r14" +PR = "r15" inherit e update-alternatives -- cgit v1.2.3 From 54e4d97e8a3239994f4694168e113a9387c64d92 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 29 Oct 2008 14:15:10 +0100 Subject: e-wm: Remove left over, e gets started through the x-window-manager --- packages/e17/e-wm/Xsession.d/98enlightenment | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 packages/e17/e-wm/Xsession.d/98enlightenment diff --git a/packages/e17/e-wm/Xsession.d/98enlightenment b/packages/e17/e-wm/Xsession.d/98enlightenment deleted file mode 100644 index 7d472fa76f..0000000000 --- a/packages/e17/e-wm/Xsession.d/98enlightenment +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -E_PROFILE="" -if [ -r /etc/enlightenment/default_profile ]; then - . /etc/enlightenment/default_profile -fi - -exec enlightenment_start $E_PROFILE -- cgit v1.2.3 From 7cf8236642164092b9f9ba5a7be580d12871fa85 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 12 May 2008 12:47:29 +0000 Subject: mono: Two svn checkouts are used, specify a SRCREV_FORMAT Currently the same SRCREV is used for mcs and mono so have a simple SRCREV_FORMAT. --- packages/mono/mono_svn.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/mono/mono_svn.inc b/packages/mono/mono_svn.inc index be007e4b9e..908fd3da70 100644 --- a/packages/mono/mono_svn.inc +++ b/packages/mono/mono_svn.inc @@ -3,8 +3,9 @@ SECTION = "devel/mono" LICENSE = "GPL LGPL X11" SRCREV = "87352" -SRC_URI = "svn://anonsvn.mono-project.com/source/trunk/;module=mcs;rev=${SRCREV} \ - svn://anonsvn.mono-project.com/source/trunk/;module=mono;rev=${SRCREV} " +SRC_URI = "svn://anonsvn.mono-project.com/source/trunk/;module=mcs;rev=${SRCREV};name=mcs \ + svn://anonsvn.mono-project.com/source/trunk/;module=mono;rev=${SRCREV};name=mono " +SRCREV_FORMAT = "rmono" PV = "1.2.5.1+svnr${SRCREV}" S = "${WORKDIR}/mono" -- cgit v1.2.3 From 509a1ba26dc5f08b55c726187c40b6858dbd8fea Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 28 Jul 2008 10:33:37 +0200 Subject: bashism: Move away from pushd/popd as it is only available for bash --- packages/freenote/freenote_1.12.0.bb | 5 +++-- packages/mono/mono_1.2.5.1.bb | 8 ++++---- packages/mono/mono_1.2.6.bb | 8 ++++---- packages/mono/mono_svn.bb | 8 ++++---- packages/nunome/nunome_1.0.2.bb | 8 ++++---- packages/xorg-xserver/xserver-xorg_cvs.bb | 4 +++- 6 files changed, 22 insertions(+), 19 deletions(-) diff --git a/packages/freenote/freenote_1.12.0.bb b/packages/freenote/freenote_1.12.0.bb index e28689ebf0..8f77776131 100644 --- a/packages/freenote/freenote_1.12.0.bb +++ b/packages/freenote/freenote_1.12.0.bb @@ -16,8 +16,9 @@ do_configure_prepend() { mv -f FreeNote subdir1 mv -f FreeNoteSetup subdir2 printf "TEMPLATE=subdirs\nSUBDIRS=subdir1 subdir2\n" >> freenote.pro - pushd ${S}/subdir1 && rm *.pro && qmake -project && echo "TARGET=FreeNote" >> subdir1.pro && popd - pushd ${S}/subdir2 && rm *.pro && qmake -project && echo "TARGET=FreeNoteSetup" >> subdir2.pro && popd + cd ${S}/subdir1 && rm *.pro && qmake -project && echo "TARGET=FreeNote" >> subdir1.pro + cd ${S}/subdir2 && rm *.pro && qmake -project && echo "TARGET=FreeNoteSetup" >> subdir2.pro + cd ${S} } do_install() { diff --git a/packages/mono/mono_1.2.5.1.bb b/packages/mono/mono_1.2.5.1.bb index d073aa7d98..8c56d9b835 100644 --- a/packages/mono/mono_1.2.5.1.bb +++ b/packages/mono/mono_1.2.5.1.bb @@ -14,9 +14,9 @@ EXTRA_OECONF += " --disable-mcs-build " do_install_prepend() { install -d ${D} - pushd ${D} + cd ${D} tar -xzf ${STAGING_DATADIR_NATIVE}/mono-mcs/mono-mcs-${PV}.tar.gz - popd + cd ${S} } do_install_append() { @@ -24,11 +24,11 @@ do_install_append() { # however, jay is not being cross-compiled and thus only # available for the buildhost architecture, so remove it # entirely - pushd ${D} + cd ${D} rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \ ./usr/share/jay/README.jay \ ./usr/bin/jay - popd + cd ${S} # Not packaged with the default rules and apparently # not used for anything diff --git a/packages/mono/mono_1.2.6.bb b/packages/mono/mono_1.2.6.bb index f436a67df5..c039828180 100644 --- a/packages/mono/mono_1.2.6.bb +++ b/packages/mono/mono_1.2.6.bb @@ -12,9 +12,9 @@ EXTRA_OECONF += " --disable-mcs-build " do_install_prepend() { install -d ${D} - pushd ${D} + cd ${D} tar -xzf ${STAGING_DATADIR_NATIVE}/mono-mcs/mono-mcs-${PV}.tar.gz - popd + cd ${S} } do_install_append() { @@ -22,11 +22,11 @@ do_install_append() { # however, jay is not being cross-compiled and thus only # available for the buildhost architecture, so remove it # entirely - pushd ${D} + cd ${D} rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \ ./usr/share/jay/README.jay \ ./usr/bin/jay - popd + cd ${S} # Not packaged with the default rules and apparently # not used for anything diff --git a/packages/mono/mono_svn.bb b/packages/mono/mono_svn.bb index a42ddd8231..a5ba966796 100644 --- a/packages/mono/mono_svn.bb +++ b/packages/mono/mono_svn.bb @@ -13,9 +13,9 @@ EXTRA_OECONF += " --disable-mcs-build " do_install_prepend() { install -d ${D} - pushd ${D} + cd ${D} tar -xzf ${STAGING_DATADIR_NATIVE}/mono-mcs/mono-mcs-${PV}.tar.gz - popd + cd ${S} } do_install_append() { @@ -23,11 +23,11 @@ do_install_append() { # however, jay is not being cross-compiled and thus only # available for the buildhost architecture, so remove it # entirely - pushd ${D} + cd ${D} rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \ ./usr/share/jay/README.jay \ ./usr/bin/jay - popd + cd ${S} # Not packaged with the default rules and apparently # not used for anything diff --git a/packages/nunome/nunome_1.0.2.bb b/packages/nunome/nunome_1.0.2.bb index 4dd1519536..bf297b0699 100644 --- a/packages/nunome/nunome_1.0.2.bb +++ b/packages/nunome/nunome_1.0.2.bb @@ -21,10 +21,10 @@ do_configure_prepend() { sed -i -e 's,/opt/QtPalmtop/bin/,${bindir}/,g' "${S}/ui/nunome.h" sed -i -e 's,/opt/QtPalmtop/,${palmtopdir}/,g' "${S}/ui/nunome.h" printf "TEMPLATE=subdirs\nSUBDIRS=Nnmlib server ui dicman ui\n" >nunome.pro - pushd Nnmlib && qmake -project -t lib && popd - pushd server && qmake -project && printf "LIBS+=-lNnmlib\nTARGET=server.bin\n" >> server.pro && popd - pushd dicman && qmake -project && printf "LIBS+=-lnunome -lNnmlib\nTARGET=dicman.bin\n" >> dicman.pro && popd - pushd ui && qmake -project -t lib && printf "LIBS+=-lNnmlib\nTARGET=nunome\n" >> ui.pro && popd + cd Nnmlib && qmake -project -t lib && cd ../ + cd server && qmake -project && printf "LIBS+=-lNnmlib\nTARGET=server.bin\n" >> server.pro && cd ../ + cd dicman && qmake -project && printf "LIBS+=-lnunome -lNnmlib\nTARGET=dicman.bin\n" >> dicman.pro && cd ../ + cd ui && qmake -project -t lib && printf "LIBS+=-lNnmlib\nTARGET=nunome\n" >> ui.pro && cd ../ find . -name "moc*"|xargs rm -f find . -name "Makefile"|xargs rm -f } diff --git a/packages/xorg-xserver/xserver-xorg_cvs.bb b/packages/xorg-xserver/xserver-xorg_cvs.bb index c1574a621b..c120dc713d 100644 --- a/packages/xorg-xserver/xserver-xorg_cvs.bb +++ b/packages/xorg-xserver/xserver-xorg_cvs.bb @@ -54,7 +54,9 @@ do_install() { do_stage() { install -d ${STAGING_INCDIR}/xserver-xorg for i in i810 via; do - pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd + cd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/ done + + cd ${S} install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/ } -- cgit v1.2.3 From d62958c18cb033b92a3329357b60e00a248aed1e Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 21 Jun 2008 04:41:32 +0800 Subject: Compile with recent glibc,gcc,headers (e.g. fedora 9) Add a patch to dbus to properly compile on fedora 9. --- packages/dbus/dbus-1.0.3/fedora-compile-fix.patch | 18 ++++++++++++++++++ packages/dbus/dbus-native_1.0.3.bb | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 packages/dbus/dbus-1.0.3/fedora-compile-fix.patch diff --git a/packages/dbus/dbus-1.0.3/fedora-compile-fix.patch b/packages/dbus/dbus-1.0.3/fedora-compile-fix.patch new file mode 100644 index 0000000000..eac37f04dd --- /dev/null +++ b/packages/dbus/dbus-1.0.3/fedora-compile-fix.patch @@ -0,0 +1,18 @@ +Do not fail with udrec being unknown and say we are using +_GNU_SOURCE. This is needed for the libc/header/gcc combo +fedora 9 is using. bits/socket.h has struct udrec #ifdefed +with _GNU. + +Index: dbus-1.0.3/dbus/dbus-sysdeps-unix.c +=================================================================== +--- dbus-1.0.3.orig/dbus/dbus-sysdeps-unix.c ++++ dbus-1.0.3/dbus/dbus-sysdeps-unix.c +@@ -22,6 +22,8 @@ + * + */ + ++#define _GNU_SOURCE ++ + #include "dbus-internals.h" + #include "dbus-sysdeps.h" + #include "dbus-sysdeps-unix.h" diff --git a/packages/dbus/dbus-native_1.0.3.bb b/packages/dbus/dbus-native_1.0.3.bb index 195557b35b..8a4c6fee7d 100644 --- a/packages/dbus/dbus-native_1.0.3.bb +++ b/packages/dbus/dbus-native_1.0.3.bb @@ -1,5 +1,6 @@ require dbus.inc +PR = "r1" DEFAULT_PREFERENCE = "-1" inherit native @@ -11,6 +12,7 @@ SRC_URI = "\ http://freedesktop.org/software/dbus/releases/dbus/dbus-${PV}.tar.gz \ file://cross.patch;patch=1 \ file://tmpdir.patch;patch=1 \ + file://fedora-compile-fix.patch;patch=1 \ file://dbus-1.init \ " -- cgit v1.2.3 From 3d702a5a96f33696d1993310105ed19861c9bc18 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 14 Aug 2008 20:22:50 +0200 Subject: tasks: Set PACKAGE_ARCH so it has an effect Set PACKAGE_ARCH after inherit task so it is not getting lost. Do not set it to all as task.bbclass is already doing that. --- packages/tasks/task-mipl.bb | 2 -- packages/tasks/task-openmoko-asu.bb | 4 ++-- packages/tasks/task-openprotium.bb | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/tasks/task-mipl.bb b/packages/tasks/task-mipl.bb index 9e2dce52f1..a2eff400a7 100644 --- a/packages/tasks/task-mipl.bb +++ b/packages/tasks/task-mipl.bb @@ -7,8 +7,6 @@ DESCRIPTION = "Mobile ipv6 extensions" inherit task -PACKAGE_ARCH = "all" - RDEPENDS = "mipv6" RRECOMMENDS = "kernel-module-ipv6 \ kernel-module-mip6 \ diff --git a/packages/tasks/task-openmoko-asu.bb b/packages/tasks/task-openmoko-asu.bb index 0cdb6aee7b..4c02abc260 100644 --- a/packages/tasks/task-openmoko-asu.bb +++ b/packages/tasks/task-openmoko-asu.bb @@ -2,12 +2,12 @@ DESCRIPTION = "Openmoko: Om 2008.8 August Software Update" SECTION = "openmoko/base" ALLOW_EMPTY = "1" -PACKAGE_ARCH = "${MACHINE_ARCH}" LICENSE = "MIT" -PR = "r2.02" +PR = "r2.03" inherit task +PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGES = "task-openmoko-asu" RDEPENDS_task-openmoko-asu = "\ bluez-hcidump \ diff --git a/packages/tasks/task-openprotium.bb b/packages/tasks/task-openprotium.bb index 4c5d762f8f..a8e7bd7766 100644 --- a/packages/tasks/task-openprotium.bb +++ b/packages/tasks/task-openprotium.bb @@ -1,11 +1,11 @@ DESCRIPTION = "Basic image for openprotium" HOMEPAGE = "http://www.openprotium.org" -PACKAGE_ARCH = "${MACHINE_ARCH}" ALLOW_EMPTY = "1" PR = "r1" inherit task +PACKAGE_ARCH = "${MACHINE_ARCH}" # be sure to build the kernel: DEPENDS = "virtual/kernel" -- cgit v1.2.3 From 2813dc78d66fc7da72fdf53010c6e148d20c0f45 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 20 Sep 2008 14:22:58 +0200 Subject: moblin-proto: Use the right git server - moblin.org => git.moblin.org --- packages/clutter/moblin-proto_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/clutter/moblin-proto_git.bb b/packages/clutter/moblin-proto_git.bb index 8ce97bbeab..25e0418b5d 100644 --- a/packages/clutter/moblin-proto_git.bb +++ b/packages/clutter/moblin-proto_git.bb @@ -3,7 +3,7 @@ DEPENDS = "clutter-box2d" PV = "0.0+git${SRCREV}" PR = "r1" -SRC_URI = "git://moblin.org/repos/users/pippin/prototype.git/;protocol=http \ +SRC_URI = "git://git.moblin.org/repos/users/pippin/prototype.git/;protocol=http \ file://paths.patch;patch=1" S = "${WORKDIR}/git" -- cgit v1.2.3