[oe-commits] org.oe.dev merge of '69c4f23827bd5d45cfcc6008cf24a3877da4126e'
oe commit
openembedded-commits at lists.openembedded.org
Tue Jul 10 15:59:46 UTC 2007
merge of '69c4f23827bd5d45cfcc6008cf24a3877da4126e'
and '7955ac422c8c76405d5746534f35c9703c7f2f09'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: bfc292511191a1c641abb3c79b523c4c95e33a03
ViewMTN: http://monotone.openembedded.org/revision.psp?id=bfc292511191a1c641abb3c79b523c4c95e33a03
Files:
1
packages/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch
packages/gcc/gcc_csl-arm-2005q3.bb
packages/linux/fsg3-kernel_2.6.18.bb
packages/e17/e-wm/applications.menu
conf/machine/fic-gta01.conf
packages/e17/e-wm/Xsession.d/98enlightenment
packages/e17/e-wm_0.16.999.038.bb
packages/glib-2.0/glib.inc
packages/parted/parted_1.8.7.bb
packages/tasks/task-gpephone.bb
Diffs:
#
# mt diff -r69c4f23827bd5d45cfcc6008cf24a3877da4126e -rbfc292511191a1c641abb3c79b523c4c95e33a03
#
#
#
# add_file "packages/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch"
# content [008311dc2f647e2edbc8237be354fcf5f5e71e2f]
#
# patch "packages/gcc/gcc_csl-arm-2005q3.bb"
# from [f98dfc1e2c2356f88fadc3cab92e030e0d162c0d]
# to [abae682fa0bd645ccf732fd208f25c9391aecd71]
#
# patch "packages/linux/fsg3-kernel_2.6.18.bb"
# from [ce39fe5171bf38acd7aea7c3116494648d56f9b4]
# to [4ac230c89fa86ba1e2157648762a1d6ad36bbc76]
#
============================================================
--- packages/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch 008311dc2f647e2edbc8237be354fcf5f5e71e2f
+++ packages/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch 008311dc2f647e2edbc8237be354fcf5f5e71e2f
@@ -0,0 +1,12 @@
+--- gcc-2005q3/gcc/config/arm/linux-eabi.h~ 2007-07-10 09:19:47.000000000 +0930
++++ gcc-2005q3/gcc/config/arm/linux-eabi.h 2007-07-10 10:42:37.000000000 +0930
+@@ -48,7 +48,8 @@
+ #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
+
+ #undef SUBTARGET_EXTRA_LINK_SPEC
+-#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux_eabi"
++#define SUBTARGET_EXTRA_LINK_SPEC \
++ " %{mbig-endian:-m armelfb_linux_eabi} %{mlittle-endian:-m armelf_linux_eabi} "
+
+ /* Use ld-linux.so.3 so that it will be possible to run "classic"
+ GNU/Linux binaries on an EABI system. */
============================================================
--- packages/gcc/gcc_csl-arm-2005q3.bb f98dfc1e2c2356f88fadc3cab92e030e0d162c0d
+++ packages/gcc/gcc_csl-arm-2005q3.bb abae682fa0bd645ccf732fd208f25c9391aecd71
@@ -13,7 +13,8 @@ SRC_URI = "http://www.codesourcery.com/p
require gcc-package.inc
SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm/2005q3-2/arm-2005q3-2-arm-none-linux-gnueabi.src.tar.bz2 \
- file://gcc_optab_arm.patch;patch=1"
+ file://gcc_optab_arm.patch;patch=1 \
+ file://gcc-3.4.4-eabi-bigendian.patch;patch=1"
do_unpack2() {
cd ${WORKDIR}
============================================================
--- packages/linux/fsg3-kernel_2.6.18.bb ce39fe5171bf38acd7aea7c3116494648d56f9b4
+++ packages/linux/fsg3-kernel_2.6.18.bb 4ac230c89fa86ba1e2157648762a1d6ad36bbc76
@@ -6,7 +6,7 @@
# http://trac.nslu2-linux.org/kernel/
#
# The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "898"
+IXP4XX_KERNEL_SVN_REV = "902"
#
# The directory containing the patches to be applied is
# specified below
#
# mt diff -r7955ac422c8c76405d5746534f35c9703c7f2f09 -rbfc292511191a1c641abb3c79b523c4c95e33a03
#
#
#
# add_file "packages/e17/e-wm/applications.menu"
# content [3d8bf0502e169a69c95a7c52ec147ede6a8f47fc]
#
# patch "conf/machine/fic-gta01.conf"
# from [d56f1f82dbbb488e26ee4937693060e3d26c9edb]
# to [1c3c67459b5584e2defd8c40e278b0e5bfff7066]
#
# patch "packages/e17/e-wm/Xsession.d/98enlightenment"
# from [5f015d49ceef56f1c736d88541563fc86328b381]
# to [bf38c3721cee2463ebf63a8aba41274addb614b0]
#
# patch "packages/e17/e-wm_0.16.999.038.bb"
# from [c1bd00d78c9f7e68324318cd985e7eece7665b23]
# to [f2ea6dcadd7059b6900c2dc234919c2db4c62c35]
#
# patch "packages/glib-2.0/glib.inc"
# from [09c2d1615f7c249f8ab1c68778bafbc98293ff6b]
# to [3b5260371e84b9c12db9a8cdc8c5809bab8d2ec5]
#
# patch "packages/parted/parted_1.8.7.bb"
# from [869ca28033957bf8a0406bc4d16876bd71dff378]
# to [35f9b305760bd77fe10ab9d0cbac3681d29a911f]
#
# patch "packages/tasks/task-gpephone.bb"
# from [b6fcf7da200e26f6d129146ad6a7c3120ba4697e]
# to [722a1f220d1d05ba19002f0f73a5c742112064b8]
#
============================================================
--- packages/e17/e-wm/applications.menu 3d8bf0502e169a69c95a7c52ec147ede6a8f47fc
+++ packages/e17/e-wm/applications.menu 3d8bf0502e169a69c95a7c52ec147ede6a8f47fc
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://standards.freedesktop.org/menu-spec/menu-1.0.dtd">
+<Menu>
+ <Name>Applications</Name>
+ <!-- <Directory>Applications.directory</Directory> -->
+
+ <!-- Read standard .directory and .desktop file locations -->
+ <DefaultAppDirs>/usr/share/applications</DefaultAppDirs>
+ <DefaultDirectoryDirs/>
+
+ <Menu>
+ <Name>Office</Name>
+ <Directory>Office.directory</Directory>
+ <Include>
+ <And>
+ <Category>Office</Category>
+ </And>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Multimedia</Name>
+ <Directory>Multimedia.directory</Directory>
+ <Include>
+ <And>
+ <Category>AudioVideo</Category>
+ </And>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Graphics</Name>
+ <Directory>Graphics.directory</Directory>
+ <Include>
+ <And>
+ <Category>Graphics</Category>
+ </And>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Games</Name>
+ <Directory>Games.directory</Directory>
+ <Include>
+ <And>
+ <Category>Games</Category>
+ </And>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Internet</Name>
+ <Directory>Internet.directory</Directory>
+ <Include>
+ <And>
+ <Category>Network</Category>
+ </And>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Settings</Name>
+ <Directory>Settings.directory</Directory>
+ <Include>
+ <And>
+ <Category>SystemSettings</Category>
+ </And>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Accessories</Name>
+ <Directory>Accessories.directory</Directory>
+ <Include>
+ <And>
+ <Or>
+ <Category>Applications</Category>
+ <Category>Utility</Category>
+ </Or>
+ <Not>
+ <Category>System</Category>
+ <Category>Office</Category>
+ <Category>Internet</Category>
+ <Category>AudioVideo</Category>
+ <Category>Graphics</Category>
+ <Category>Games</Category>
+ </Not>
+ </And>
+ </Include>
+ </Menu>
+
+</Menu>
+
============================================================
--- conf/machine/fic-gta01.conf d56f1f82dbbb488e26ee4937693060e3d26c9edb
+++ conf/machine/fic-gta01.conf 1c3c67459b5584e2defd8c40e278b0e5bfff7066
@@ -21,6 +21,11 @@ MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-gta01kbd \
kernel-module-s3cmci \
kernel-module-ext2 \
+ kernel-module-vfat \
+ kernel-module-snd-soc-neo1973-wm8753 \
+ kernel-module-snd-soc-smdk2440 \
+ kernel-module-nls-iso8859-1 \
+ kernel-module-nls-cp437 \
alsa-state"
# do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab
@@ -30,7 +35,7 @@ ROOT_FLASH_SIZE = "60"
ROOT_FLASH_SIZE = "60"
# extra jffs2 tweaks
-EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 -n"
+EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad -n"
# build tools
EXTRA_IMAGEDEPENDS += "sjf2410-linux-native"
============================================================
--- packages/e17/e-wm/Xsession.d/98enlightenment 5f015d49ceef56f1c736d88541563fc86328b381
+++ packages/e17/e-wm/Xsession.d/98enlightenment bf38c3721cee2463ebf63a8aba41274addb614b0
@@ -1,3 +1,3 @@
#!/bin/sh
+exec enlightenment_start
-exec enlightenment
============================================================
--- packages/e17/e-wm_0.16.999.038.bb c1bd00d78c9f7e68324318cd985e7eece7665b23
+++ packages/e17/e-wm_0.16.999.038.bb f2ea6dcadd7059b6900c2dc234919c2db4c62c35
@@ -1,14 +1,16 @@ LICENSE = "MIT"
DESCRIPTION = "E17 - the Enlightenment Window Mananger"
DEPENDS = "eet evas ecore edje efreet"
LICENSE = "MIT"
-PR = "r6"
+PR = "r7"
inherit e update-alternatives
SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz \
file://fix-configure.patch;patch=1 \
file://set-autoscroll-defaults.patch;patch=1 \
- file://Xsession.d/98enlightenment"
+ file://Xsession.d/98enlightenment \
+ file://applications.menu \
+ "
S = "${WORKDIR}/enlightenment-${PV}"
@@ -35,9 +37,12 @@ do_install_append() {
do_install_append() {
install -d ${D}/${sysconfdir}/X11/Xsession.d
install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d
+
+ install -d ${D}/${sysconfdir}/xdg/menus
+ install -m 644 ${WORKDIR}/applications.menu ${D}/${sysconfdir}/xdg/menus/
}
-ALTERNATIVE_PATH = "${bindir}/enlightenment"
+ALTERNATIVE_PATH = "${bindir}/enlightenment_start"
ALTERNATIVE_NAME = "x-window-manager"
ALTERNATIVE_LINK = "${bindir}/x-window-manager"
ALTERNATIVE_PRIORITY = "16"
============================================================
--- packages/glib-2.0/glib.inc 09c2d1615f7c249f8ab1c68778bafbc98293ff6b
+++ packages/glib-2.0/glib.inc 3b5260371e84b9c12db9a8cdc8c5809bab8d2ec5
@@ -8,7 +8,7 @@ DEPENDS += "virtual/libiconv virtual/lib
PRIORITY = "optional"
DEPENDS += "glib-2.0-native gtk-doc"
DEPENDS += "virtual/libiconv virtual/libintl"
-PACKAGES =+ "${PN}-dev glib-2.0-utils "
+PACKAGES =+ " glib-2.0-utils "
PR = "r1"
============================================================
--- packages/parted/parted_1.8.7.bb 869ca28033957bf8a0406bc4d16876bd71dff378
+++ packages/parted/parted_1.8.7.bb 35f9b305760bd77fe10ab9d0cbac3681d29a911f
@@ -1,9 +1,9 @@ DEPENDS = "readline e2fsprogs-libs"
DESCRIPTION = "parted, the GNU partition resizing program"
HOMEPAGE = "http://www.gnu.org/software/parted/parted.html"
LICENSE = "GPLv2"
SECTION = "console/tools"
DEPENDS = "readline e2fsprogs-libs"
-PR = "r0"
+PR = "r1"
SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz"
@@ -20,3 +20,8 @@ do_stage() {
do_stage() {
autotools_stage_all
}
+
+# Requires autoconf 2.61. Without it, will build, but there
+# will be link errors when some other package will link against
+# libparted.
+DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/tasks/task-gpephone.bb b6fcf7da200e26f6d129146ad6a7c3120ba4697e
+++ packages/tasks/task-gpephone.bb 722a1f220d1d05ba19002f0f73a5c742112064b8
@@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for GPE Pal
DESCRIPTION = "Task packages for GPE Palmtop Environment Phone Edition"
-PR = "r4"
+PR = "r5"
LICENSE = "MIT"
ALLOW_EMPTY = "1"
@@ -18,12 +18,13 @@ RDEPENDS_gpephone-task-development = "\
RDEPENDS_gpephone-task-development = "\
rxvt-unicode \
- xmonobut \
gpe-terminal \
gpe-edit \
gdb \
strace \
- e2fsprogs"
+ e2fsprogs \
+ bluez-utils-compat \
+ minicom"
RDEPENDS_gpephone-task-base = "\
cms92init \
More information about the Openembedded-commits
mailing list