[oe-commits] org.oe.dev merge of '35d78dbf37aba06eaf047d4d83daf9d28ba25728'
pfalcon commit
openembedded-commits at lists.openembedded.org
Thu Jul 19 21:46:49 UTC 2007
merge of '35d78dbf37aba06eaf047d4d83daf9d28ba25728'
and '6632df74a3ff0af8c91330d38e0d6018c8794762'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: a264432776659b8cd5d5a9ccd28e66df7b823a4c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a264432776659b8cd5d5a9ccd28e66df7b823a4c
Files:
1
packages/initrdscripts/initramfs-nfsboot_0.2.bb
packages/images/initramfs-image.bb
packages/images/initramfs-minimal-image.bb
packages/initrdscripts/initramfs-jffs2
packages/initrdscripts/files/init.sh
packages/initrdscripts/files/loopboot.sh
packages/initrdscripts/initramfs-jffs2/jffs2boot.sh
packages/initrdscripts/initramfs-jffs2_0.1.bb
packages/initrdscripts/initramfs-module-loop_0.1.bb
packages/initrdscripts/initramfs-module-nfs_0.1.bb
packages/initrdscripts/initramfs_0.1.bb
packages/initrdscripts/files/nfsboot.sh
packages/bluez/bluez-gnome_cvs.bb
packages/bluez/bluez-gnome_git.bb
packages/linux/ixp4xx-kernel_2.6.21.5.bb
packages/linux/ixp4xx-kernel_2.6.21.6.bb
packages/openobex/openobex-1.3
packages/bluez/files/pkgconfig-add-gthread.patch
packages/coreutils/coreutils-5.3.0/futimens.patch
packages/gnome/gnome-desktop_2.18.3.bb
packages/gnome/gnome-vfs-obexftp_0.4.bb
packages/libsdl/files/kernel-asm-page.patch
packages/openobex/openobex-1.3/libusb_crosscompile_check.patch
packages/openobex/openobex_1.3.bb
packages/sylpheed/claws-mail.inc
packages/sylpheed/claws-mail_2.9.1.bb
packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.15.bb
packages/sylpheed/claws-plugin-mailmbox_1.13.bb
packages/sylpheed/claws-plugin-rssyl_0.13.bb
packages/sylpheed/files/desktop.patch
packages/sylpheed/files/streamline-ui.patch
conf/distro/include/slugos.inc
conf/machine/compulab-pxa270.conf
conf/machine/spitz.conf
packages/clutter/clutter_svn.bb
packages/coreutils/coreutils_5.3.0.bb
packages/gstreamer/gst-plugins-base_0.10.12.bb
packages/libsdl/libsdl-native_1.2.11.bb
packages/linphone/linphone_1.6.0.bb
packages/linux/linux-hackndev-2.6/palmt650/defconfig
packages/linux/linux-hackndev-2.6_svn.bb
packages/openobex/openobex_1.2.bb
packages/opie-taskbar/opie-taskbar-images.inc
packages/opie-taskbar/opie-taskbar-images_cvs.bb
packages/tasks/task-gpe.bb
packages/webkit/webkit/WebKit.pri
Diffs:
#
# mt diff -r35d78dbf37aba06eaf047d4d83daf9d28ba25728 -ra264432776659b8cd5d5a9ccd28e66df7b823a4c
#
#
#
# delete "packages/initrdscripts/initramfs-nfsboot_0.2.bb"
#
# rename "packages/images/initramfs-image.bb"
# to "packages/images/initramfs-minimal-image.bb"
#
# add_dir "packages/initrdscripts/initramfs-jffs2"
#
# add_file "packages/images/initramfs-image.bb"
# content [15ad681b7b1290f860ece7c2f18277e57ee50cc9]
#
# add_file "packages/initrdscripts/files/init.sh"
# content [71313983c36c150465f7a9caca6f672da5828e4a]
#
# add_file "packages/initrdscripts/files/loopboot.sh"
# content [895a6f6b6aebecbc1064e069019e70f93c8e380a]
#
# add_file "packages/initrdscripts/initramfs-jffs2/jffs2boot.sh"
# content [d52425b59cb253661ac2548077becd69997515eb]
#
# add_file "packages/initrdscripts/initramfs-jffs2_0.1.bb"
# content [1eab8e522ee185522c577729e8ac079c6c85c207]
#
# add_file "packages/initrdscripts/initramfs-module-loop_0.1.bb"
# content [267ae701dc2cd445aecbf05bd0e5a86282064e0d]
#
# add_file "packages/initrdscripts/initramfs-module-nfs_0.1.bb"
# content [62635c830fd535d4ff4b1c60539a08d5cd14ffe9]
#
# add_file "packages/initrdscripts/initramfs_0.1.bb"
# content [fb1fee7b80590b33bac5b3c0682c4cec9c84cd69]
#
# patch "packages/initrdscripts/files/nfsboot.sh"
# from [afb73401091d5a724bee10191fa902d1a44e7658]
# to [cc74b5caa9ab77aa37036dc350e5b6aea94c0f7a]
#
============================================================
--- packages/images/initramfs-image.bb 15ad681b7b1290f860ece7c2f18277e57ee50cc9
+++ packages/images/initramfs-image.bb 15ad681b7b1290f860ece7c2f18277e57ee50cc9
@@ -0,0 +1,19 @@
+# Sample initramfs image
+LICENSE = "MIT"
+PR = "r1"
+
+#RDEPENDS = "initramfs-boot busybox kernel-module-uinput uclibc libgcc1"
+RDEPENDS = "initramfs initramfs-module-nfs initramfs-module-loop \
+ busybox-static"
+
+RRECOMENDS = "kernel-module-uinput kernel-module-fat \
+ kernel-module-vfat kernel-module-loop"
+
+export IMAGE_BASENAME = "initramfs-image"
+export IMAGE_LINGUAS = ""
+
+PACKAGE_INSTALL = "${RDEPENDS}"
+# Install only ${PACKAGE_INSTALL}, not even deps
+PACKAGE_INSTALL_NO_DEPS = "1"
+
+inherit image
============================================================
--- packages/initrdscripts/files/init.sh 71313983c36c150465f7a9caca6f672da5828e4a
+++ packages/initrdscripts/files/init.sh 71313983c36c150465f7a9caca6f672da5828e4a
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+MODULE_DIR=/initrd.d
+BOOT_ROOT=
+ROOT_DEVICE=/dev/null
+
+early_setup() {
+ mkdir /proc
+ mount -t proc proc /proc
+ mkdir /mnt
+
+ echo -n "creating device nodes: "
+ grep '^ *[0-9]' /proc/partitions | while read major minor blocks dev
+ do
+ if [ ! -e /dev/$dev ]; then
+ echo -n "$dev "
+ [ -e /dev/$dev ] || mknod /dev/$dev b $major $minor
+ fi
+ done
+ echo
+}
+
+read_args() {
+ CMDLINE=`cat /proc/cmdline`
+ for arg in $CMDLINE; do
+ optarg=`expr "x$arg" : 'x[^=]*=\(.*\)'`
+ case $arg in
+ root=*)
+ ROOT_DEVICE=$optarg ;;
+ rootdelay=*)
+ rootdelay=$optarg ;;
+ esac
+ done
+}
+
+load_modules() {
+ for module in $MODULE_DIR/*; do
+ source $module
+ done
+}
+
+boot_root() {
+ cd $BOOT_ROOT
+ exec switch_root -c /dev/console $BOOT_ROOT /sbin/init
+}
+
+boot_failed() {
+ echo "No valid root device was specified. Please add root=/dev/something to"
+ echo "the kernel command-line and try again."
+ echo
+ exec sh
+}
+
+echo "Starting initramfs boot..."
+early_setup
+read_args
+
+if [ -n "$rootdelay" ]; then
+ echo "Waiting $rootdelay seconds for devices to settle..."
+ sleep $rootdelay
+fi
+
+load_modules
+[ -n "$BOOT_ROOT" ] && boot_root
+boot_failed
============================================================
--- packages/initrdscripts/files/loopboot.sh 895a6f6b6aebecbc1064e069019e70f93c8e380a
+++ packages/initrdscripts/files/loopboot.sh 895a6f6b6aebecbc1064e069019e70f93c8e380a
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+if [ "$ROOT_DEVICE" = "/dev/loop" ]; then
+ loop_mount() {
+ loopdev=/dev/loop$loop_num
+ mountpt=/mnt/loop$loop_num
+
+ [ -e $loopdev ] || mknod $loopdev b 7 $loop_num
+
+ # if only one argument was specified, let it be path not dev
+ if [ -z "$path" ] && [ -n "$dev" ]; then
+ path="$dev"
+ dev=""
+ fi
+ [ -z "$offset" ] && offset=0
+
+ if [ -n "$dev" ]; then
+ hostpt=`expr "$dev" : '.*/\([^/]*\)'`
+ [ -z "$hostpt" ] && hostpt="$dev"
+
+ echo "Mounting $dev on $hostpt"
+ mkdir $hostpt
+ mount $dev $hostpt
+ cd $hostpt
+ fi
+
+ echo "Loopback setup of $path (offset $offset)"
+ losetup -o "$offset" "$loopdev" "$path"
+
+ echo "Mounting $loopdev on $mountpt"
+ mkdir "$mountpt"
+ mount "$loopdev" "$mountpt"
+ cd "$mountpt"
+ BOOT_ROOT="$mountpt"
+ loop_num=`expr "$loop_num" + 1`
+ }
+
+ modprobe vfat
+ modprobe loop
+
+ loop_num=0
+
+ for arg in $CMDLINE; do
+ optarg=`expr "x$arg" : 'x[^=]*=\(.*\)'`
+ echo $arg xxx $optarg
+ case $arg in
+ looproot=*)
+ dev=`expr "$optarg" : '\([^:]*\).*'`
+ path=`expr "$optarg" : '[^:]*:\([^:]*\).*'`
+ offset=`expr "$optarg" : '[^:]*:[^:]*:\([^:]*\).*'`
+ loop_mount ;;
+ esac
+ done
+fi
============================================================
--- packages/initrdscripts/initramfs-jffs2/jffs2boot.sh d52425b59cb253661ac2548077becd69997515eb
+++ packages/initrdscripts/initramfs-jffs2/jffs2boot.sh d52425b59cb253661ac2548077becd69997515eb
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+echo "Starting initrd boot..."
+mkdir /proc
+mount -t proc proc /proc
+
+modprobe mtdram total_size=24576 erase_size=256
+sleep 1
+
+ID=`grep "mtdram test device" /proc/mtd | cut -d: -f1| cut -b4-`
+
+cat /initrd.jffs2 >/dev/mtdblock$ID
+
+mkdir /mnt
+mount -t jffs2 /dev/mtdblock$ID /mnt
+
+cd /mnt
+exec switch_root -c /dev/console /mnt /sbin/init
============================================================
--- packages/initrdscripts/initramfs-jffs2_0.1.bb 1eab8e522ee185522c577729e8ac079c6c85c207
+++ packages/initrdscripts/initramfs-jffs2_0.1.bb 1eab8e522ee185522c577729e8ac079c6c85c207
@@ -0,0 +1,8 @@
+SRC_URI = "file://jffs2boot.sh"
+PR = "r0"
+
+do_install() {
+ install -m 0755 ${WORKDIR}/jffs2boot.sh ${D}/init
+}
+
+FILES_${PN} += " /init "
============================================================
--- packages/initrdscripts/initramfs-module-loop_0.1.bb 267ae701dc2cd445aecbf05bd0e5a86282064e0d
+++ packages/initrdscripts/initramfs-module-loop_0.1.bb 267ae701dc2cd445aecbf05bd0e5a86282064e0d
@@ -0,0 +1,8 @@
+SRC_URI = "file://loopboot.sh"
+PR = "r0"
+
+do_install() {
+ install -m 0755 ${WORKDIR}/loopboot.sh ${D}/initrd.d/loop
+}
+
+FILES_${PN} += " /initrd.d/loop "
============================================================
--- packages/initrdscripts/initramfs-module-nfs_0.1.bb 62635c830fd535d4ff4b1c60539a08d5cd14ffe9
+++ packages/initrdscripts/initramfs-module-nfs_0.1.bb 62635c830fd535d4ff4b1c60539a08d5cd14ffe9
@@ -0,0 +1,8 @@
+SRC_URI = "file://nfsboot.sh"
+PR = "r1"
+
+do_install() {
+ install -m 0755 ${WORKDIR}/nfsboot.sh ${D}/initrd.d/nfs
+}
+
+FILES_${PN} += " /initrd.d/nfs "
============================================================
--- packages/initrdscripts/initramfs_0.1.bb fb1fee7b80590b33bac5b3c0682c4cec9c84cd69
+++ packages/initrdscripts/initramfs_0.1.bb fb1fee7b80590b33bac5b3c0682c4cec9c84cd69
@@ -0,0 +1,8 @@
+SRC_URI = "file://init.sh"
+PR = "r0"
+
+do_install() {
+ install -m 0755 ${WORKDIR}/init.sh ${D}/init
+}
+
+FILES_${PN} += " /init "
============================================================
--- packages/initrdscripts/files/nfsboot.sh afb73401091d5a724bee10191fa902d1a44e7658
+++ packages/initrdscripts/files/nfsboot.sh cc74b5caa9ab77aa37036dc350e5b6aea94c0f7a
@@ -1,50 +1,43 @@
#!/bin/sh
-echo "Starting initramfs boot..."
-mkdir /proc
-mount -t proc proc /proc
+if [ "$ROOT_DEVICE" = "/dev/nfs" ]; then
-for arg in `cat /proc/cmdline`; do
- echo $arg
- optarg=`expr "x$arg" : 'x[^=]*=\(.*\)'`
- echo $optarg
- case $arg in
- root=*)
- root=$optarg ;;
- nfsroot=*)
- nfsroot=$optarg ;;
- ip=*)
- ip=$optarg ;;
- esac
-done
+ # These correspond to what kernel itself uses
+ # DO NOT CHANGE!
+ NFS_OPTIONS="-o nfsvers=2,nolock"
-echo $ip | (IFS=: read client_ip server_ip gw_ip netmask hostname device autoconf; \
-echo client_ip=$client_ip;
-echo server_ip=$server_ip;
-echo gw_ip=$gw_ip;
-echo netmask=$netmask;
-echo hostname=$hostname;
-echo device=$device;
-echo autoconf=$autoconf;
+ for arg in $CMDLINE; do
+ echo $arg
+ optarg=`expr "x$arg" : 'x[^=]*=\(.*\)'`
+ echo $optarg
+ case $arg in
+ nfsroot=*)
+ nfsroot=$optarg ;;
+ ip=*)
+ ip=$optarg ;;
+ esac
+ done
+
+ echo $ip | (IFS=: read client_ip server_ip gw_ip netmask hostname device autoconf; \
+ echo client_ip=$client_ip;
+ echo server_ip=$server_ip;
+ echo gw_ip=$gw_ip;
+ echo netmask=$netmask;
+ echo hostname=$hostname;
+ echo device=$device;
+ echo autoconf=$autoconf;
+
+ case "$device" in
+ usb*)
+ echo "USB"
+ modprobe g_ether
+ ;;
+ esac
+
+ ifconfig $device $client_ip
+ )
-case "x$device" in
- usb*)
- echo "USB"
- modprobe g_ether
- ;;
-esac
-
-ifconfig $device $client_ip
-)
-
-mkdir /mnt
-if [ "x$root" = "x/dev/nfs" ]; then
echo "booting from NFS: $nfsroot"
- mount -t nfs $nfsroot /mnt
-else
- echo "booting from: $root"
- mount $root /mnt
+ mount -t nfs $NFS_OPTIONS $nfsroot /mnt
+ BOOT_ROOT=/mnt
fi
-
-cd /mnt
-exec switch_root -c /dev/console /mnt /sbin/init
#
# mt diff -r6632df74a3ff0af8c91330d38e0d6018c8794762 -ra264432776659b8cd5d5a9ccd28e66df7b823a4c
#
#
#
# rename "packages/bluez/bluez-gnome_cvs.bb"
# to "packages/bluez/bluez-gnome_git.bb"
#
# rename "packages/linux/ixp4xx-kernel_2.6.21.5.bb"
# to "packages/linux/ixp4xx-kernel_2.6.21.6.bb"
#
# add_dir "packages/openobex/openobex-1.3"
#
# add_file "packages/bluez/files/pkgconfig-add-gthread.patch"
# content [6c09cd3241b74b602c6af47bd99cbda71e53d7e0]
#
# add_file "packages/coreutils/coreutils-5.3.0/futimens.patch"
# content [8b0fd4cbd9f8b4c19f8690c6a0df9844f864da86]
#
# add_file "packages/gnome/gnome-desktop_2.18.3.bb"
# content [aedf2dc2ff050fdb7531f504b91874001a221108]
#
# add_file "packages/gnome/gnome-vfs-obexftp_0.4.bb"
# content [555b36870f62cdd554674dc129e98b5c699c50c9]
#
# add_file "packages/libsdl/files/kernel-asm-page.patch"
# content [c330d9173694f5d2da97b4be571622fb8ad8d195]
#
# add_file "packages/openobex/openobex-1.3/libusb_crosscompile_check.patch"
# content [806a66d6387725e35426e814ed3d4aed84d1bf09]
#
# add_file "packages/openobex/openobex_1.3.bb"
# content [a54af39b7b65c24dffc5e3e76748b02caa9a345d]
#
# add_file "packages/sylpheed/claws-mail.inc"
# content [70dc56c3455d2a0844a513547e62dd0a066acb6f]
#
# add_file "packages/sylpheed/claws-mail_2.9.1.bb"
# content [9c76d7640bf39645ce37ffa98021de5d835b2427]
#
# add_file "packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.15.bb"
# content [d73fb5b9c737c95ee038731dd97b16a271288e97]
#
# add_file "packages/sylpheed/claws-plugin-mailmbox_1.13.bb"
# content [c30ec52d9c35c4540aaab1048d113479f86fd866]
#
# add_file "packages/sylpheed/claws-plugin-rssyl_0.13.bb"
# content [d11e21e5ff03c258c29f668c8416de99cd346425]
#
# add_file "packages/sylpheed/files/desktop.patch"
# content [55d0bbbe039f37d150f9574de2d124fc9d1c16e4]
#
# add_file "packages/sylpheed/files/streamline-ui.patch"
# content [6f7fed506bb96c5de5538ebb8ec4ecd4e7cba24f]
#
# patch "conf/distro/include/slugos.inc"
# from [3e36695f3609a3860b7ddbfbf78b4d746f8dccc9]
# to [e2b01734de8b2e6dca970ce26b4168e0b7fa033c]
#
# patch "conf/machine/compulab-pxa270.conf"
# from [e1433a559cc7c747740b88df5f017a83d402e34a]
# to [d9dda180b32b678bbc7dc3203f202d0227bd7798]
#
# patch "conf/machine/spitz.conf"
# from [0774bb1854881b48179ff35042a7145465097e32]
# to [fb942cabc090e6ba0dd98dc4a57d07867813a6ed]
#
# patch "packages/bluez/bluez-gnome_git.bb"
# from [42803f40aaa448142b85aff6d1c1dc49cdcf1d4d]
# to [ad5f43c2750098ef22df298f118dfcd64ccffd01]
#
# patch "packages/clutter/clutter_svn.bb"
# from [583618b5428b11ee203f421217829819e350ccd6]
# to [e95e5fdb28ed0f924a7af0b83340d372125ad4fd]
#
# patch "packages/coreutils/coreutils_5.3.0.bb"
# from [e3c222c8a27658bb6f3092680fe67a444fd60c47]
# to [2223f1c92c49c889593d31301609cfa7d888d1cb]
#
# patch "packages/gstreamer/gst-plugins-base_0.10.12.bb"
# from [869ff5fd4c0a0a6c0be50c18079d9aaaa40ceb38]
# to [42b568147310d58a2ca061df2db79c873973b472]
#
# patch "packages/libsdl/libsdl-native_1.2.11.bb"
# from [e9e581735b9f05b42424cddeb52b17e590296483]
# to [5e5d90533f76a9b2ce70d129759c139f4c7df596]
#
# patch "packages/linphone/linphone_1.6.0.bb"
# from [77c69b1286f82211e37b6d6cde29f8fc492c17c7]
# to [12fa57bdfc35f887f98bd8c835b566f34d02f011]
#
# patch "packages/linux/ixp4xx-kernel_2.6.21.6.bb"
# from [e9a048ca3969704b32d14ddaf7a1b15c1413e95f]
# to [0b15c2bd8e24d2c3c24fab57a684fe921123a952]
#
# patch "packages/linux/linux-hackndev-2.6/palmt650/defconfig"
# from [d477770893e81e774adbedf9f5551bc7f6476e2f]
# to [3381801ae55223bc90835b0ee066afe2554e177b]
#
# patch "packages/linux/linux-hackndev-2.6_svn.bb"
# from [1b77cf9af0ecbac19c41606d03d140abad2ca6b9]
# to [148cf43784ebfeb5d4fddc91933aac16db7fb859]
#
# patch "packages/openobex/openobex_1.2.bb"
# from [5ece940f25b192397d8566c4ff08f3982845d05a]
# to [6fc26419d5ff49b75a0eff5907ad9148cf66b9a7]
#
# patch "packages/opie-taskbar/opie-taskbar-images.inc"
# from [bcc14b15dcb6f610fb2fb93ea7a22680e5dc7c34]
# to [af9f1520fa611e94512ba6574a480e95de8a16bd]
#
# patch "packages/opie-taskbar/opie-taskbar-images_cvs.bb"
# from [364b475cbe870792af3b1c15affcecd9defe9c8e]
# to [1bba5e8ec05293d5c7cc7bb8b1381f603bec4e86]
#
# patch "packages/tasks/task-gpe.bb"
# from [8a506969d5ce478b90afda1c9305460abb39c51c]
# to [cb4baeeea50ecdf6485cc9fdd8b4a96b6f2b00e2]
#
# patch "packages/webkit/webkit/WebKit.pri"
# from [66a2198f6e713621703e637cb558322feb4153e5]
# to [94510fbc949e86f0ce4710c19900c4a6a8c163a9]
#
============================================================
--- packages/bluez/files/pkgconfig-add-gthread.patch 6c09cd3241b74b602c6af47bd99cbda71e53d7e0
+++ packages/bluez/files/pkgconfig-add-gthread.patch 6c09cd3241b74b602c6af47bd99cbda71e53d7e0
@@ -0,0 +1,50 @@
+Index: git/configure.in
+===================================================================
+--- git.orig/configure.in 2007-07-17 17:25:52.000000000 +0100
++++ git/configure.in 2007-07-17 17:25:52.000000000 +0100
+@@ -75,6 +75,10 @@
+ AC_SUBST(OPENOBEX_CFLAGS)
+ AC_SUBST(OPENOBEX_LIBS)
+
++PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.10, dummy=yes, dummy=no)
++AC_SUBST(GTHREAD_CFLAGS)
++AC_SUBST(GTHREAD_LIBS)
++
+ AC_ARG_BLUEZ
+
+ AC_OUTPUT(Makefile compat/Makefile common/Makefile applet/Makefile properties/Makefile sendto/Makefile wizard/Makefile proximity/Makefile po/Makefile.in)
+Index: git/applet/Makefile.am
+===================================================================
+--- git.orig/applet/Makefile.am 2007-07-17 17:25:52.000000000 +0100
++++ git/applet/Makefile.am 2007-07-17 17:25:52.000000000 +0100
+@@ -4,12 +4,12 @@
+ bluetooth_applet_SOURCES = main.c
+
+ bluetooth_applet_LDADD = $(top_builddir)/compat/libcompat.a $(top_builddir)/common/libcommon.a \
+- @NOTIFY_LIBS@ @GCONF_LIBS@ @GTK_LIBS@ @HAL_LIBS@ @DBUS_LIBS@
++ @NOTIFY_LIBS@ @GCONF_LIBS@ @GTK_LIBS@ @HAL_LIBS@ @DBUS_LIBS@ @GTHREAD_LIBS@
+
+ nodist_bluetooth_applet_SOURCES = $(top_builddir)/common/passkey-agent-glue.h \
+ $(top_builddir)/common/auth-agent-glue.h
+
+-AM_CFLAGS = @DBUS_CFLAGS@ @HAL_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@ @NOTIFY_CFLAGS@ -DSYSCONFDIR=\"$(sysconfdir)\"
++AM_CFLAGS = @DBUS_CFLAGS@ @HAL_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@ @NOTIFY_CFLAGS@ @GTHREAD_CFLAGS@ -DSYSCONFDIR=\"$(sysconfdir)\"
+
+ INCLUDES = -I$(top_builddir)/common -I$(top_srcdir)/compat
+
+Index: git/properties/Makefile.am
+===================================================================
+--- git.orig/properties/Makefile.am 2007-07-17 17:28:11.000000000 +0100
++++ git/properties/Makefile.am 2007-07-17 17:28:44.000000000 +0100
+@@ -4,9 +4,9 @@
+ bluetooth_properties_SOURCES = main.c
+
+ bluetooth_properties_LDADD = $(top_builddir)/common/libcommon.a \
+- @GCONF_LIBS@ @GTK_LIBS@ @HAL_LIBS@ @DBUS_LIBS@
++ @GCONF_LIBS@ @GTK_LIBS@ @HAL_LIBS@ @DBUS_LIBS@ @GTHREAD_LIBS@
+
+-AM_CFLAGS = @DBUS_CFLAGS@ @HAL_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@
++AM_CFLAGS = @DBUS_CFLAGS@ @HAL_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@ @GTHREAD_CFLAGS@
+
+ INCLUDES = -I$(top_srcdir)/common
+
============================================================
--- packages/coreutils/coreutils-5.3.0/futimens.patch 8b0fd4cbd9f8b4c19f8690c6a0df9844f864da86
+++ packages/coreutils/coreutils-5.3.0/futimens.patch 8b0fd4cbd9f8b4c19f8690c6a0df9844f864da86
@@ -0,0 +1,44 @@
+Index: coreutils-5.3.0/lib/utimens.c
+===================================================================
+--- coreutils-5.3.0.orig/lib/utimens.c 2005-01-03 22:19:15.000000000 +0000
++++ coreutils-5.3.0/lib/utimens.c 2007-07-01 19:12:32.000000000 +0000
+@@ -55,8 +55,8 @@
+ If TIMESPEC is null, set the time stamps to the current time. */
+
+ int
+-futimens (int fd ATTRIBUTE_UNUSED,
+- char const *file, struct timespec const timespec[2])
++gl_futimens (int fd ATTRIBUTE_UNUSED,
++ char const *file, struct timespec const timespec[2])
+ {
+ /* There's currently no interface to set file timestamps with
+ nanosecond resolution, so do the best we can, discarding any
+@@ -117,5 +117,5 @@
+ int
+ utimens (char const *file, struct timespec const timespec[2])
+ {
+- return futimens (-1, file, timespec);
++ return gl_futimens (-1, file, timespec);
+ }
+Index: coreutils-5.3.0/lib/utimens.h
+===================================================================
+--- coreutils-5.3.0.orig/lib/utimens.h 2004-11-23 20:54:33.000000000 +0000
++++ coreutils-5.3.0/lib/utimens.h 2007-07-01 19:12:37.000000000 +0000
+@@ -1,3 +1,3 @@
+ #include "timespec.h"
+-int futimens (int, char const *, struct timespec const [2]);
++int gl_futimens (int, char const *, struct timespec const [2]);
+ int utimens (char const *, struct timespec const [2]);
+Index: coreutils-5.3.0/src/touch.c
+===================================================================
+--- coreutils-5.3.0.orig/src/touch.c 2004-11-23 20:54:35.000000000 +0000
++++ coreutils-5.3.0/src/touch.c 2007-07-01 19:11:52.000000000 +0000
+@@ -191,7 +191,7 @@
+ t = timespec;
+ }
+
+- ok = (futimens (fd, file, t) == 0);
++ ok = (gl_futimens (fd, file, t) == 0);
+ if (fd != -1)
+ ok &= (close (fd) == 0);
+
============================================================
--- packages/gnome/gnome-desktop_2.18.3.bb aedf2dc2ff050fdb7531f504b91874001a221108
+++ packages/gnome/gnome-desktop_2.18.3.bb aedf2dc2ff050fdb7531f504b91874001a221108
@@ -0,0 +1,25 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome"
+PR = "r2"
+DESCRIPTION = "GNOME library for reading .desktop files"
+inherit gnome pkgconfig
+
+DEPENDS = "gnome-common gnome-doc-utils libgnomeui"
+
+SRC_URI += "file://scrollkeeper.patch;patch=1 \
+ file://no-desktop-docs.patch;patch=1;pnum=0"
+
+EXTRA_OECONF = "--disable-scrollkeeper"
+
+EXTRA_AUTORECONF = "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros"
+
+do_configure_prepend () {
+ cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S}
+}
+
+FILES_${PN} += "${datadir}/gnome-about"
+
+
+do_stage () {
+ autotools_stage_all
+}
============================================================
--- packages/gnome/gnome-vfs-obexftp_0.4.bb 555b36870f62cdd554674dc129e98b5c699c50c9
+++ packages/gnome/gnome-vfs-obexftp_0.4.bb 555b36870f62cdd554674dc129e98b5c699c50c9
@@ -0,0 +1,13 @@
+DESCRIPTION = "obex plugin for gnome-vfs"
+LICENSE = "GPLv2"
+DEPENDS = "openobex gnome-vfs bluez-utils"
+
+PR = "r1"
+
+inherit gnome
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs-obexftp/${PV}/${PN}-${PV}.tar.bz2"
+
+FILES_${PN}-dbg += "${libdir}/gnome-vfs-2.0/modules/.debug"
+FILES_${PN} += "${libdir}/gnome-vfs-2.0/modules/*.so"
+
============================================================
--- packages/libsdl/files/kernel-asm-page.patch c330d9173694f5d2da97b4be571622fb8ad8d195
+++ packages/libsdl/files/kernel-asm-page.patch c330d9173694f5d2da97b4be571622fb8ad8d195
@@ -0,0 +1,13 @@
+diff --git a/src/video/Xext/Xxf86dga/XF86DGA.c b/src/video/Xext/Xxf86dga/XF86DGA.c
+index 4e3d662..de38a3c 100644
+--- a/src/video/Xext/Xxf86dga/XF86DGA.c
++++ b/src/video/Xext/Xxf86dga/XF86DGA.c
+@@ -18,7 +18,7 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc
+ #define HAS_MMAP_ANON
+ #include <sys/types.h>
+ #include <sys/mman.h>
+-#include <asm/page.h> /* PAGE_SIZE */
++#include <unistd.h>
+ #define HAS_SC_PAGESIZE /* _SC_PAGESIZE may be an enum for Linux */
+ #define HAS_GETPAGESIZE
+ #endif /* linux */
============================================================
--- packages/openobex/openobex-1.3/libusb_crosscompile_check.patch 806a66d6387725e35426e814ed3d4aed84d1bf09
+++ packages/openobex/openobex-1.3/libusb_crosscompile_check.patch 806a66d6387725e35426e814ed3d4aed84d1bf09
@@ -0,0 +1,11 @@
+--- /tmp/acinclude.m4 2007-07-19 15:11:49.000000000 +0200
++++ openobex-1.3/acinclude.m4 2007-07-19 15:13:06.925215000 +0200
+@@ -128,7 +128,7 @@
+
+ if (test "${usb_enable}" = "yes" && test "${usb_found}" = "yes"); then
+ AC_DEFINE(HAVE_USB, 1, [Define if system supports USB and it's enabled])
+- AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="$REQUIRES libusb")
++ REQUIRES="libusb"
+ fi
+
+ AM_CONDITIONAL(APPS, test "${apps_enable}" = "yes")
============================================================
--- packages/openobex/openobex_1.3.bb a54af39b7b65c24dffc5e3e76748b02caa9a345d
+++ packages/openobex/openobex_1.3.bb a54af39b7b65c24dffc5e3e76748b02caa9a345d
@@ -0,0 +1,33 @@
+DESCRIPTION = "The Openobex project is an open source implementation of the \
+Object Exchange (OBEX) protocol."
+HOMEPAGE = "http://openobex.triq.net"
+SECTION = "libs"
+PROVIDES = "openobex-apps"
+DEPENDS = "libusb bluez-libs"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \
+ file://disable-cable-test.patch;patch=1 \
+ file://libusb_crosscompile_check.patch;patch=1"
+
+inherit autotools binconfig pkgconfig
+
+EXTRA_OECONF = "--enable-apps --enable-syslog --enable-dump \
+ --with-usb=${STAGING_LIBDIR}/.. --with-bluez=${STAGING_LIBDIR}/.."
+
+do_stage() {
+ oe_libinstall -so -C lib libopenobex ${STAGING_LIBDIR}
+ ln -sf libopenobex.so ${STAGING_LIBDIR}/libopenobex-1.2.so
+ install -d ${STAGING_INCDIR}/openobex
+ install -m 0644 include/*.h ${STAGING_INCDIR}/openobex/
+ install -d ${STAGING_DIR}/aclocal
+ install -m 0644 openobex.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+# how to stop shlibrename from renaming -apps?
+PACKAGES += "openobex-apps"
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${bindir}/openobex-config"
+FILES_${PN}-apps = "${bindir}/*"
+DEBIAN_NOAUTONAME_${PN}-apps = "1"
============================================================
--- packages/sylpheed/claws-mail.inc 70dc56c3455d2a0844a513547e62dd0a066acb6f
+++ packages/sylpheed/claws-mail.inc 70dc56c3455d2a0844a513547e62dd0a066acb6f
@@ -0,0 +1,54 @@
+SECTION = "x11/network"
+DESCRIPTION = "Mail user agent"
+DEPENDS = "gtk+ libetpan openssl aspell"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "\
+ ${SOURCEFORGE_MIRROR}/sylpheed-claws/claws-mail-${PV}.tar.bz2 \
+ file://desktop.patch;patch=1 \
+ file://streamline-ui.patch;patch=1 \
+ "
+
+FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
+
+EXTRA_OECONF = "--disable-aspell-test \
+ --enable--aspell \
+ --disable-manual \
+ --disable-crash-dialog \
+ --disable-jpilot \
+ --disable-trayicon-plugin \
+ --disable-spamassassin-plugin \
+ --disable-bogofilter-plugin \
+ --disable-pgpcore-plugin \
+ --disable-pgpmime-plugin \
+ --disable-pgpinline-plugin \
+ --disable-dillo-viewer-plugin \
+ --disable-clamav-plugin \
+ --disable-gnomeprint \
+ --disable-valgrind \
+ "
+
+CFLAGS += "-D_GNU_SOURCE"
+
+inherit autotools pkgconfig
+
+
+do_configure() {
+ gnu-configize
+ libtoolize --force
+ oe_runconf
+}
+
+do_install_append() {
+ install -d ${D}${datadir}/applications
+ install -m 0644 claws-mail.desktop ${D}${datadir}/applications/
+ install -d ${D}${datadir}/pixmaps
+ install -m 0644 claws-mail.png ${D}${datadir}/pixmaps/
+ mv ${D}${bindir}/${TARGET_SYS}-claws-mail ${D}${bindir}/${PN}
+}
+
+do_stage () {
+ autotools_stage_all
+}
+
============================================================
--- packages/sylpheed/claws-mail_2.9.1.bb 9c76d7640bf39645ce37ffa98021de5d835b2427
+++ packages/sylpheed/claws-mail_2.9.1.bb 9c76d7640bf39645ce37ffa98021de5d835b2427
@@ -0,0 +1 @@
+require claws-mail.inc
============================================================
--- packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.15.bb d73fb5b9c737c95ee038731dd97b16a271288e97
+++ packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.15.bb d73fb5b9c737c95ee038731dd97b16a271288e97
@@ -0,0 +1,20 @@
+SECTION = "x11/network"
+DESCRIPTION = "Mail user agent plugins"
+DEPENDS = "claws-mail gtkhtml2 curl"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://www.claws-mail.org/downloads/plugins/gtkhtml2_viewer-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+S = "${WORKDIR}/gtkhtml2_viewer-${PV}"
+
+do_configure() {
+ gnu-configize
+ libtoolize --force
+ oe_runconf
+}
+
+FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
+
============================================================
--- packages/sylpheed/claws-plugin-mailmbox_1.13.bb c30ec52d9c35c4540aaab1048d113479f86fd866
+++ packages/sylpheed/claws-plugin-mailmbox_1.13.bb c30ec52d9c35c4540aaab1048d113479f86fd866
@@ -0,0 +1,20 @@
+SECTION = "x11/network"
+DESCRIPTION = "Mail user agent plugins"
+DEPENDS = "claws-mail"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "http://www.claws%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list