[oe-commits] org.oe.dev merge of '662671acd71fe1d35ae40225df2ec7c130b09f78'
pfalcon commit
openembedded-commits at lists.openembedded.org
Fri Jan 4 00:44:09 UTC 2008
merge of '662671acd71fe1d35ae40225df2ec7c130b09f78'
and '912468215c017fe786e40c9ee8de03bb61484993'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: c3a341f8c36447946dd29b81db83f0abdd7bb3f2
ViewMTN: http://monotone.openembedded.org/revision/info/c3a341f8c36447946dd29b81db83f0abdd7bb3f2
Files:
1
packages/openmoko-apps/openmoko-gps_0.0.1+svnr4.bb
packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb
packages/openmoko-apps/files/openmoko-gps.desktop
packages/util-linux-ng/util-linux-ng.inc
packages/images/initramfs-minimal-image.bb
Diffs:
#
# mt diff -r662671acd71fe1d35ae40225df2ec7c130b09f78 -rc3a341f8c36447946dd29b81db83f0abdd7bb3f2
#
#
#
# rename "packages/openmoko-apps/openmoko-gps_0.0.1+svnr4.bb"
# to "packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb"
#
# patch "packages/openmoko-apps/files/openmoko-gps.desktop"
# from [8de00334237a36840fa9f10a8ed4a3ff34429d4a]
# to [27bf14fef64ac997da0176c6227ef495fbd23ddc]
#
# patch "packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb"
# from [78238c49f66f342914243c0044a1286225d9955a]
# to [4274e6a3673edc5493b4f3227e02987d79cb0426]
#
# patch "packages/util-linux-ng/util-linux-ng.inc"
# from [5cc612853b6855e2f4df6b91f5f06801c6b029aa]
# to [3289f2865db0b2e423541c2ebf65db5ac8d5529e]
#
============================================================
--- packages/openmoko-apps/files/openmoko-gps.desktop 8de00334237a36840fa9f10a8ed4a3ff34429d4a
+++ packages/openmoko-apps/files/openmoko-gps.desktop 27bf14fef64ac997da0176c6227ef495fbd23ddc
@@ -1,9 +1,9 @@ Exec=gps_reader.py
[Desktop Entry]
Encoding=UTF-8
Name=GPS
Comment=Display GPS coordinates
Exec=gps_reader.py
-Icon=openmoko-terminal
+Icon=openmoko-gps2
Terminal=false
Type=Application
Categories=GTK;Application;Utilities;
============================================================
--- packages/openmoko-apps/openmoko-gps_0.0.1+svnr4.bb 78238c49f66f342914243c0044a1286225d9955a
+++ packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb 4274e6a3673edc5493b4f3227e02987d79cb0426
@@ -14,11 +14,11 @@ RDEPENDS = "python-pygtk"
RDEPENDS = "python-pygtk"
-PR = "r0"
+PR = "r1"
######################################################################################
-SRC_URI = "svn://forge.bearstech.com/bearforge/openmoko;module=gps;rev=4 \
+SRC_URI = "svn://forge.bearstech.com/bearforge/openmoko;module=gps;rev=6 \
file://openmoko-gps.desktop"
S = "${WORKDIR}/gps"
@@ -26,7 +26,9 @@ do_install() {
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-gps2.png
}
============================================================
--- packages/util-linux-ng/util-linux-ng.inc 5cc612853b6855e2f4df6b91f5f06801c6b029aa
+++ packages/util-linux-ng/util-linux-ng.inc 3289f2865db0b2e423541c2ebf65db5ac8d5529e
@@ -6,8 +6,9 @@ inherit autotools
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 @@ RDEPENDS_${PN} = "util-linux-umount util
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}${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}
+ 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}/
+
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
#
# mt diff -r912468215c017fe786e40c9ee8de03bb61484993 -rc3a341f8c36447946dd29b81db83f0abdd7bb3f2
#
#
#
# patch "packages/images/initramfs-minimal-image.bb"
# from [06a49c2ea305fe2ab0ea3fd38e08c81dcd675500]
# to [dbd98cff25cbaf41dce93c25db637d21705ffa51]
#
============================================================
--- packages/images/initramfs-minimal-image.bb 06a49c2ea305fe2ab0ea3fd38e08c81dcd675500
+++ packages/images/initramfs-minimal-image.bb dbd98cff25cbaf41dce93c25db637d21705ffa51
@@ -1,7 +1,6 @@
# Sample initramfs image
-#IMAGE_INSTALL = "initramfs-boot busybox kernel-module-uinput uclibc libgcc1"
-IMAGE_INSTALL = "initramfs-nfsboot busybox-static kernel-module-uinput"
+IMAGE_INSTALL = "initramfs-module-nfs busybox-static"
export IMAGE_BASENAME = "initramfs-image"
IMAGE_LINGUAS = ""
More information about the Openembedded-commits
mailing list