From cd06d19972831142dfcdbaf12cb47594a6f682ea Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Thu, 3 Jan 2008 21:15:00 +0000 Subject: openmoko-gps: Update to latest version and add new icon. mtN: ---------------------------------------------------------------------- --- packages/openmoko-apps/files/openmoko-gps.desktop | 2 +- packages/openmoko-apps/openmoko-gps_0.0.1+svnr4.bb | 32 -------------------- packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb | 34 ++++++++++++++++++++++ 3 files changed, 35 insertions(+), 33 deletions(-) delete mode 100644 packages/openmoko-apps/openmoko-gps_0.0.1+svnr4.bb create mode 100644 packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb (limited to 'packages') diff --git a/packages/openmoko-apps/files/openmoko-gps.desktop b/packages/openmoko-apps/files/openmoko-gps.desktop index ed3ec23933..a496745da4 100644 --- a/packages/openmoko-apps/files/openmoko-gps.desktop +++ b/packages/openmoko-apps/files/openmoko-gps.desktop @@ -3,7 +3,7 @@ Encoding=UTF-8 Name=GPS Comment=Display GPS coordinates Exec=gps_reader.py -Icon=openmoko-terminal +Icon=openmoko-gps Terminal=false Type=Application Categories=GTK;Application;Utilities; diff --git a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr4.bb b/packages/openmoko-apps/openmoko-gps_0.0.1+svnr4.bb deleted file mode 100644 index a0a0a50942..0000000000 --- a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr4.bb +++ /dev/null @@ -1,32 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2008 -# License: MIT (see http://www.opensource.org/licenses/mit-license.php -# for a copy of the license) -# -# Filename: openmoko-gps_svn.bb -# Date: 20080101 (YMD) - -DESCRIPTION = "A tiny GPS output parser for the OpenMoko platform." -HOMEPAGE = "http://forge.bearstech.com/trac/wiki/OpenMokoGPS" -SECTION = "base" -LICENSE = "GPL" - -RDEPENDS = "python-pygtk" - -PR = "r0" - -###################################################################################### - -SRC_URI = "svn://forge.bearstech.com/bearforge/openmoko;module=gps;rev=4 \ - file://openmoko-gps.desktop" - -S = "${WORKDIR}/gps" - -do_install() { - install -d ${D}/usr/bin - install -d ${D}/usr/share/applications/ - - install -m 0755 ${S}/gps_reader.py ${D}/usr/bin - install -m 0644 ${WORKDIR}/openmoko-gps.desktop ${D}/usr/share/applications/ -} diff --git a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb b/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb new file mode 100644 index 0000000000..1d00b6a78d --- /dev/null +++ b/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb @@ -0,0 +1,34 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2008 +# License: MIT (see http://www.opensource.org/licenses/mit-license.php +# for a copy of the license) +# +# Filename: openmoko-gps_svn.bb +# Date: 20080101 (YMD) + +DESCRIPTION = "A tiny GPS output parser for the OpenMoko platform." +HOMEPAGE = "http://forge.bearstech.com/trac/wiki/OpenMokoGPS" +SECTION = "base" +LICENSE = "GPL" + +RDEPENDS = "python-pygtk" + +PR = "r0" + +###################################################################################### + +SRC_URI = "svn://forge.bearstech.com/bearforge/openmoko;module=gps;rev=6 \ + file://openmoko-gps.desktop" + +S = "${WORKDIR}/gps" + +do_install() { + install -d ${D}/usr/bin + install -d ${D}/usr/share/applications/ + install -d ${D}/usr/share/pixmaps/ + + install -m 0755 ${S}/gps_reader.py ${D}/usr/bin + install -m 0644 ${WORKDIR}/openmoko-gps.desktop ${D}/usr/share/applications/ + install -m 0644 ${S}/icon.png ${D}/usr/share/pixmaps/openmoko-gps.png +} -- cgit v1.2.3 From 51e42c17e8a759a080b6767c8a137875cec2b8ac Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Thu, 3 Jan 2008 21:21:26 +0000 Subject: util-linux-ng: Install binaries into same locations as util-linux does. --- packages/util-linux-ng/util-linux-ng.inc | 51 +++++++++++++++++++------------- 1 file changed, 31 insertions(+), 20 deletions(-) (limited to 'packages') diff --git a/packages/util-linux-ng/util-linux-ng.inc b/packages/util-linux-ng/util-linux-ng.inc index 987b85dc29..c01458d626 100644 --- a/packages/util-linux-ng/util-linux-ng.inc +++ b/packages/util-linux-ng/util-linux-ng.inc @@ -6,8 +6,9 @@ DEPENDS = "zlib ncurses e2fsprogs-libs" inherit autotools # I'm finishing this recipe during the 2.13.1 candidate release cycle -# @todo Remove $RC later. See if patches are needed. File locations. +# @todo Remove $RC later. See if patches are needed. Move files from /usr/*. # -- Leon 'likewise' Woestenberg + RC="-rc2" DEFAULT_PREFERENCE = "-1" @@ -36,7 +37,9 @@ FILES_util-linux-readprofile = "/usr/sbin/readprofile" RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile " RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup" -EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown" +EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown \ +--enable-kill --enable-last --enable-mesg --enable-raw --enable-login-utils \ +--enable-arch --enable-init" S = "${WORKDIR}/util-linux-ng-${PV}${RC}" @@ -81,30 +84,38 @@ do_install () { oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= \ 'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \ 'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install - return 0 - test -f ${D}${base_sbindir}/pivot_root && \ - mv ${D}${base_sbindir}/pivot_root ${D}${base_sbindir}/pivot_root.${PN} - mv ${D}${base_bindir}/dmesg ${D}${base_bindir}/dmesg.${PN} - mv ${D}${base_bindir}/kill ${D}${base_bindir}/kill.${PN} - mv ${D}${base_bindir}/more ${D}${base_bindir}/more.${PN} - mv ${D}${base_sbindir}/hwclock ${D}${base_sbindir}/hwclock.${PN} - mv ${D}${base_sbindir}/mkswap ${D}${base_sbindir}/mkswap.${PN} - mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN} - mv ${D}${base_sbindir}/sln ${D}${base_sbindir}/sln.${PN} - mv ${D}${base_sbindir}/mkfs.minix ${D}${base_sbindir}/mkfs.minix.${PN} - mv ${D}${base_sbindir}/fsck.minix ${D}${base_sbindir}/fsck.minix.${PN} + mkdir ${D}${base_bindir} + mkdir ${D}${base_sbindir} + test -f ${D}${sbindir}/pivot_root && \ + mv ${D}${sbindir}/pivot_root ${D}${base_sbindir}/pivot_root.${PN} + mv ${D}${bindir}/dmesg ${D}${base_bindir}/dmesg.${PN} + mv ${D}${bindir}/kill ${D}${base_bindir}/kill.${PN} + mv ${D}${bindir}/more ${D}${base_bindir}/more.${PN} + mv ${D}${sbindir}/hwclock ${D}${base_sbindir}/hwclock.${PN} + mv ${D}${sbindir}/mkswap ${D}${base_sbindir}/mkswap.${PN} + mv ${D}${sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN} +# mv ${D}${sbindir}/sln ${D}${base_sbindir}/sln.${PN} + mv ${D}${sbindir}/mkfs.minix ${D}${base_sbindir}/mkfs.minix.${PN} + mv ${D}${sbindir}/fsck.minix ${D}${base_sbindir}/fsck.minix.${PN} mv ${D}${bindir}/hexdump ${D}${bindir}/hexdump.${PN} mv ${D}${bindir}/last ${D}${bindir}/last.${PN} mv ${D}${bindir}/logger ${D}${bindir}/logger.${PN} mv ${D}${bindir}/mesg ${D}${bindir}/mesg.${PN} mv ${D}${bindir}/renice ${D}${bindir}/renice.${PN} mv ${D}${bindir}/wall ${D}${bindir}/wall.${PN} + return 0 + + mv ${D}${sbindir}/losetup ${D}${base_sbindir}/losetup.${PN} + mv ${D}${sbindir}/swapon ${D}${base_sbindir}/swapon.${PN} + mv ${D}${bindir}/umount ${D}${base_bindir}/umount.${PN} + mv ${D}${bindir}/mount ${D}${base_bindir}/mount.${PN} + mv ${D}${sbindir}/fdisk ${D}${base_sbindir}/fdisk.${PN} + + mv ${D}${bindir}/agetty ${D}${base_sbindir}/ + mv ${D}${bindir}/blockdev ${D}${base_sbindir}/ + mv ${D}${bindir}/cfdisk ${D}${base_sbindir}/ + mv ${D}${bindir}/ctrlaltdel ${D}${base_sbindir}/ - mv ${D}${base_sbindir}/losetup ${D}${base_sbindir}/losetup.${PN} - mv ${D}${base_sbindir}/swapon ${D}${base_sbindir}/swapon.${PN} - mv ${D}${base_bindir}/umount ${D}${base_bindir}/umount.${PN} - mv ${D}${base_bindir}/mount ${D}${base_bindir}/mount.${PN} - mv ${D}${base_sbindir}/fdisk ${D}${base_sbindir}/fdisk.${PN} install -d ${D}${sysconfdir}/default/ echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall @@ -132,7 +143,7 @@ pkg_postinst_${PN} () { update-alternatives --install ${bindir}/renice renice renice.${PN} 100 update-alternatives --install ${bindir}/wall wall wall.${PN} 100 - # There seems to be problem, atleast on nslu2, with these, untill they are + # There seems to be problem, atleast on nslu2, with these, until they are # fixed the busybox ones have higher priority update-alternatives --install ${base_sbindir}/hwclock hwclock hwclock.${PN} 10 update-alternatives --install ${base_sbindir}/shutdown shutdown shutdown.${PN} 10 -- cgit v1.2.3 From c5c78c3746fa20932160ff585b3e4c53f4e6c69d Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Thu, 3 Jan 2008 23:28:27 +0000 Subject: openmoko-apps: openmoko-gps: Fix icon name --- packages/openmoko-apps/files/openmoko-gps.desktop | 2 +- packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/openmoko-apps/files/openmoko-gps.desktop b/packages/openmoko-apps/files/openmoko-gps.desktop index a496745da4..8273b8183d 100644 --- a/packages/openmoko-apps/files/openmoko-gps.desktop +++ b/packages/openmoko-apps/files/openmoko-gps.desktop @@ -3,7 +3,7 @@ Encoding=UTF-8 Name=GPS Comment=Display GPS coordinates Exec=gps_reader.py -Icon=openmoko-gps +Icon=openmoko-gps2 Terminal=false Type=Application Categories=GTK;Application;Utilities; diff --git a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb b/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb index 1d00b6a78d..9028393b4e 100644 --- a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb +++ b/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb @@ -14,7 +14,7 @@ LICENSE = "GPL" RDEPENDS = "python-pygtk" -PR = "r0" +PR = "r1" ###################################################################################### @@ -30,5 +30,5 @@ do_install() { install -m 0755 ${S}/gps_reader.py ${D}/usr/bin install -m 0644 ${WORKDIR}/openmoko-gps.desktop ${D}/usr/share/applications/ - install -m 0644 ${S}/icon.png ${D}/usr/share/pixmaps/openmoko-gps.png + install -m 0644 ${S}/icon.png ${D}/usr/share/pixmaps/openmoko-gps2.png } -- cgit v1.2.3