[oe-commits] org.oe.dev merge of '33fb6aa0bcede524e3a5d6d9f4e9ed212a2c2335'
koen commit
openembedded-commits at lists.openembedded.org
Thu Nov 15 19:48:01 UTC 2007
merge of '33fb6aa0bcede524e3a5d6d9f4e9ed212a2c2335'
and 'b21b578d6a02e2eb83b67423222b1cb7e6fcfc49'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 5a50d1d54a36230e32c94701cae6d541b1ff2707
ViewMTN: http://monotone.openembedded.org/revision/info/5a50d1d54a36230e32c94701cae6d541b1ff2707
Files:
1
packages/matchbox-common/matchbox-common_0.9.1.bb
packages/matchbox-wm/matchbox-wm_1.2.bb
packages/navit/navit_cvs.bb
packages/base-files/base-files/akita/fstab
packages/base-files/base-files/c7x0/fstab
packages/base-files/base-files/collie/fstab
packages/base-files/base-files/poodle/fstab
packages/base-files/base-files/spitz/fstab
packages/base-files/base-files/tosa/fstab
packages/base-files/base-files_3.0.14.bb
Diffs:
#
# mt diff -r33fb6aa0bcede524e3a5d6d9f4e9ed212a2c2335 -r5a50d1d54a36230e32c94701cae6d541b1ff2707
#
#
#
# patch "packages/matchbox-common/matchbox-common_0.9.1.bb"
# from [bddf9d7d1a113a7b887c375bef97a8a3174105be]
# to [68df8bc491f589a6f3e7b69e5b10ec838e6b621f]
#
# patch "packages/matchbox-wm/matchbox-wm_1.2.bb"
# from [36a2cba9690e481018472bdb8535b9f41a7769bf]
# to [98095f550f8c77883c44c40c96ff2b2161a07c87]
#
============================================================
--- packages/matchbox-common/matchbox-common_0.9.1.bb bddf9d7d1a113a7b887c375bef97a8a3174105be
+++ packages/matchbox-common/matchbox-common_0.9.1.bb 68df8bc491f589a6f3e7b69e5b10ec838e6b621f
@@ -1,14 +1,14 @@ DEPENDS = "libmatchbox"
DESCRIPTION = "Matchbox window manager common files"
SECTION = "x11/wm"
LICENSE = "GPL"
DEPENDS = "libmatchbox"
-PR = "r3"
+PR = "r4"
SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \
file://no-utilities-category.patch;patch=1 \
file://add-media-category.patch;patch=1"
-inherit autotools pkgconfig
+inherit autotools pkgconfig update-alternatives
EXTRA_OECONF = "--enable-pda-folders"
@@ -17,4 +17,10 @@ FILES_${PN} = "\
${datadir}/matchbox/vfolders \
${datadir}/pixmaps"
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PATH = "${bindir}/matchbox-window-manager"
+ALTERNATIVE_PRIORITY = "11"
+
+
PACKAGE_ARCH = "all"
============================================================
--- packages/matchbox-wm/matchbox-wm_1.2.bb 36a2cba9690e481018472bdb8535b9f41a7769bf
+++ packages/matchbox-wm/matchbox-wm_1.2.bb 98095f550f8c77883c44c40c96ff2b2161a07c87
@@ -1,9 +1,9 @@ RDEPENDS = ""
require matchbox-wm.inc
DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf gconf-native "
RDEPENDS = ""
-PR="r2"
+PR="r3"
SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \
file://gconf-2.m4 \
@@ -23,7 +23,7 @@ ALTERNATIVE_LINK = "${bindir}/x-window-m
ALTERNATIVE_NAME = "x-window-manager"
ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PATH = "${bindir}/matchbox-session"
+ALTERNATIVE_PATH = "${bindir}/matchbox-window-manager"
ALTERNATIVE_PRIORITY = "10"
EXTRA_OECONF = " \
#
# mt diff -rb21b578d6a02e2eb83b67423222b1cb7e6fcfc49 -r5a50d1d54a36230e32c94701cae6d541b1ff2707
#
#
#
# add_file "packages/navit/navit_cvs.bb"
# content [bc906c7a1120cb9f65cf1e357eaacd23ff8e0df9]
#
# patch "packages/base-files/base-files/akita/fstab"
# from [051fdab814430f401dc16286d1b777bc35162b34]
# to [855484ea65b3d49701e574e221d3465069d37a0e]
#
# patch "packages/base-files/base-files/c7x0/fstab"
# from [eed9bc8456143ce5a434151621475fb86deb06ac]
# to [04cc26eb17a1dc0d9f40acf54504ae3438ad60c5]
#
# patch "packages/base-files/base-files/collie/fstab"
# from [05311cfbc2a0c4d6c46a9fd4069350acd0e738af]
# to [d021297a86dede194f58f281f05215ada358a38b]
#
# patch "packages/base-files/base-files/poodle/fstab"
# from [073a091164137a993354145d11ab8fec7d5d705e]
# to [68f3d377a9ee2c1310021b9097f1937f7e5ac18b]
#
# patch "packages/base-files/base-files/spitz/fstab"
# from [35ab9eb73d1459c8df77b39504039919fed923f8]
# to [e2d7a6cfe5868408dac45ab759d61f4463307ac0]
#
# patch "packages/base-files/base-files/tosa/fstab"
# from [6437623746ef3ac7b1c5885e9b3b1d769225f2e1]
# to [631ad0716796432fa213c13cdbc22b739968800b]
#
# patch "packages/base-files/base-files_3.0.14.bb"
# from [5ad0ff2fa42f3bbdf7ceaf70ccf5f97af9120efa]
# to [56808741a8321e9f358d766697b017963b7292b4]
#
============================================================
--- packages/navit/navit_cvs.bb bc906c7a1120cb9f65cf1e357eaacd23ff8e0df9
+++ packages/navit/navit_cvs.bb bc906c7a1120cb9f65cf1e357eaacd23ff8e0df9
@@ -0,0 +1,19 @@
+DESCRIPTION = "Navit is a car navigation system with routing engine."
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 gtk+"
+PV = "0.0.2+cvs${SRCDATE}"
+PR = "r0"
+
+inherit autotools
+S = "${WORKDIR}/navit"
+
+SRC_URI = "cvs://anonymous@navit.cvs.sourceforge.net/cvsroot/navit;module=navit \
+ "
+
+EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned"
+#--enable-shared
+
+EXTRA_AUTORECONF = " -I m4"
+
+FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
+
============================================================
--- packages/base-files/base-files/akita/fstab 051fdab814430f401dc16286d1b777bc35162b34
+++ packages/base-files/base-files/akita/fstab 855484ea65b3d49701e574e221d3465069d37a0e
@@ -8,12 +8,12 @@ tmpfs /dev/shm
tmpfs /dev/shm tmpfs mode=0777 0 0
# SD/MMC in kernel 2.4
-/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
+#/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
# SD/MMC in kernel 2.6
/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
# USB Storage
/dev/sda1 /media/usbhdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0
-usbfs /proc/bus/usb usbf defaults 0 0
+usbfs /proc/bus/usb usbfs defaults 0 0
============================================================
--- packages/base-files/base-files/c7x0/fstab eed9bc8456143ce5a434151621475fb86deb06ac
+++ packages/base-files/base-files/c7x0/fstab 04cc26eb17a1dc0d9f40acf54504ae3438ad60c5
@@ -8,6 +8,6 @@ tmpfs /dev/shm
tmpfs /dev/shm tmpfs mode=0777 0 0
# SD/MMC in kernel 2.4
-/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
+#/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
# SD/MMC in kernel 2.6
/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
============================================================
--- packages/base-files/base-files/collie/fstab 05311cfbc2a0c4d6c46a9fd4069350acd0e738af
+++ packages/base-files/base-files/collie/fstab d021297a86dede194f58f281f05215ada358a38b
@@ -1,9 +1,13 @@ proc /proc proc defaults
/dev/mtdblock4 / jffs2 defaults 1 1
proc /proc proc defaults 0 0
/dev/hda1 /media/cf auto defaults,sync,noauto,noatime,user,exec,suid,gid=100,umask=0002 0 0
-/dev/mmcda1 /media/card auto defaults,sync,noauto,noatime,user,exec,suid 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
tmpfs /dev/shm tmpfs mode=0777 0 0
# we use a non-volatile ramdisk, see /etc/init.d/ramdisk
#tmpfs /media/ram tmpfs defaults 0 0
+
+# SD/MMC in kernel 2.4
+#/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
+# SD/MMC in kernel 2.6
+/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
============================================================
--- packages/base-files/base-files/poodle/fstab 073a091164137a993354145d11ab8fec7d5d705e
+++ packages/base-files/base-files/poodle/fstab 68f3d377a9ee2c1310021b9097f1937f7e5ac18b
@@ -7,7 +7,7 @@ proc /proc proc defaults 0 0
/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
# SD/MMC in kernel 2.4
-/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
+#/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
tmpfs /dev/shm tmpfs mode=0777 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
============================================================
--- packages/base-files/base-files/spitz/fstab 35ab9eb73d1459c8df77b39504039919fed923f8
+++ packages/base-files/base-files/spitz/fstab e2d7a6cfe5868408dac45ab759d61f4463307ac0
@@ -12,7 +12,7 @@ tmpfs /dev/shm
# Compact Flash memory cards
/dev/hdc1 /media/cf auto defaults,sync,noauto 0 0
# SD/MMC in kernel 2.4
-/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
+#/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
# SD/MMC in kernel 2.6
/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
============================================================
--- packages/base-files/base-files/tosa/fstab 6437623746ef3ac7b1c5885e9b3b1d769225f2e1
+++ packages/base-files/base-files/tosa/fstab 631ad0716796432fa213c13cdbc22b739968800b
@@ -10,6 +10,6 @@ usbfs /proc/bus/usb
usbfs /proc/bus/usb usbfs auto 0 0
# SD/MMC in kernel 2.4
-/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
+#/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
# SD/MMC in kernel 2.6
/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
============================================================
--- packages/base-files/base-files_3.0.14.bb 5ad0ff2fa42f3bbdf7ceaf70ccf5f97af9120efa
+++ packages/base-files/base-files_3.0.14.bb 56808741a8321e9f358d766697b017963b7292b4
@@ -1,7 +1,7 @@ PRIORITY = "required"
DESCRIPTION = "Miscellaneous files for the base system."
SECTION = "base"
PRIORITY = "required"
-PR = "r74"
+PR = "r75"
LICENSE = "GPL"
SRC_URI = " \
More information about the Openembedded-commits
mailing list