[oe-commits] org.oe.dev merge of '324c9ae28ad0981fb0295081bc51f62d2b0333ab'
mickeyl commit
openembedded-commits at lists.openembedded.org
Fri Jan 18 05:23:04 UTC 2008
merge of '324c9ae28ad0981fb0295081bc51f62d2b0333ab'
and '6fdc0cb19db57ac2a4d88dec24b554f7b34c593d'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 2eadd91fadb429f90d6d5b0714a7265811f206b6
ViewMTN: http://monotone.openembedded.org/revision/info/2eadd91fadb429f90d6d5b0714a7265811f206b6
Files:
1
packages/gnutls/gnutls
packages/gnutls/gnutls-1.6.3
packages/gpe-scap/gpe-scap-1.3
packages/xcursor-transparent-theme/xcursor-watchonly-theme
packages/gpe-scap/gpe-scap-1.3/allow-glade-2.4.0.patch
packages/linux/chumby-kernel/chumby-override-cmdline.patch
packages/rt2x00/rt73-chumby_1.2.bb
packages/xcursor-transparent-theme/xcursor-watchonly-theme/20xcursor-transparent
packages/xcursor-transparent-theme/xcursor-watchonly-theme/skip_watch_cursor.patch
conf/machine/chumby.conf
conf/machine/fic-gta02.conf
packages/gnutls/gnutls.inc
packages/gnutls/gnutls_1.6.3.bb
packages/gpe-scap/gpe-scap_1.3.bb
packages/gpe-session-scripts/files/angstrom/matchbox-session
packages/gpe-session-scripts/files/matchbox-session
packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
packages/linux/chumby-kernel/defconfig
packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb
packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb
mtn:execute
true
packages/e17/e-wm_0.16.999.038.bb
packages/e17/e-wm_cvs.bb
packages/e17/e-utils_cvs.bb
packages/e17/e-wm_0.16.999.041.bb
packages/e17/edje-editor_cvs.bb
packages/e17/edje-viewer_cvs.bb
packages/e17/entice_cvs.bb
packages/e17/entrance_0.9.0.010.bb
packages/e17/examine_cvs.bb
packages/e17/exhibit_cvs.bb
packages/e17/expedite_cvs.bb
packages/e17/rage_0.2.0.005.bb
packages/efl1/ecore-native_cvs.bb
packages/efl1/ecore_cvs.bb
packages/efl1/edbus_cvs.bb
packages/efl1/edje-native_cvs.bb
packages/efl1/edje_cvs.bb
packages/efl1/eet_cvs.bb
packages/efl1/efreet_cvs.bb
packages/efl1/embryo_cvs.bb
packages/efl1/evas.inc
packages/efl1/evas_cvs.bb
Diffs:
#
# mt diff -r324c9ae28ad0981fb0295081bc51f62d2b0333ab -r2eadd91fadb429f90d6d5b0714a7265811f206b6
#
#
#
# rename "packages/gnutls/gnutls"
# to "packages/gnutls/gnutls-1.6.3"
#
# add_dir "packages/gpe-scap/gpe-scap-1.3"
#
# add_dir "packages/xcursor-transparent-theme/xcursor-watchonly-theme"
#
# add_file "packages/gpe-scap/gpe-scap-1.3/allow-glade-2.4.0.patch"
# content [3fca637842d4f56756161b44d99ea894218489ab]
#
# add_file "packages/linux/chumby-kernel/chumby-override-cmdline.patch"
# content [8305fa51831e4f5f03145b9ab02e8829bed237e7]
#
# add_file "packages/rt2x00/rt73-chumby_1.2.bb"
# content [96ccbba0b9b10dc2424492a1baa986c6a2f1944c]
#
# add_file "packages/xcursor-transparent-theme/xcursor-watchonly-theme/20xcursor-transparent"
# content [a5b22f1aa71c4d2079e2875c22ecfb1735d68612]
#
# add_file "packages/xcursor-transparent-theme/xcursor-watchonly-theme/skip_watch_cursor.patch"
# content [6b2c049ef8e46368a7a8c9d7cfac98a1eff1c03c]
#
# patch "conf/machine/chumby.conf"
# from [83ab431ac03a48b06b82de26db56cd04bf9a912a]
# to [3d7a9c183a4567571b4914f1a614545e5029b69c]
#
# patch "conf/machine/fic-gta02.conf"
# from [47adecd1ee4496da827ee13c515774484b0373ec]
# to [9c53b1252d1b563a297e0d6174f4eb462b003de1]
#
# patch "packages/gnutls/gnutls.inc"
# from [cc20d75c7e1753143d7a8fd4b2ec7fc8a708868a]
# to [684fa353da238f622dd47843a2ab39f725289869]
#
# patch "packages/gnutls/gnutls_1.6.3.bb"
# from [dbb7cf9f7c57730e2f8cac2d3f4c14485a44bf85]
# to [00f6ee42f807520ea4255904e757ed8cd210a4da]
#
# patch "packages/gpe-scap/gpe-scap_1.3.bb"
# from [ea05f8ee476d853b1883d58d4bc62e8d23ba9041]
# to [73e961b984f8eaea1c3a6678341b1484dd688c22]
#
# patch "packages/gpe-session-scripts/files/angstrom/matchbox-session"
# from [5f2775906eeda8b22303d2452c158ba979a9595d]
# to [cd7ffc92541caae372d21de0550aacc7d535d533]
#
# patch "packages/gpe-session-scripts/files/matchbox-session"
# from [5c0f9302bc62e8b8612888f54ec5d2c9300d75ab]
# to [864395d7fb408233687a04db272c51799b6d5d5d]
#
# patch "packages/gpe-session-scripts/gpe-session-scripts_0.67.bb"
# from [e886f9c3d56e6dba00f20b02fdb8cff205713397]
# to [b9030ecb91f1a88e063dc31e35f8a61d905d29eb]
#
# patch "packages/linux/chumby-kernel/defconfig"
# from [28b9bde031eb6f049b7dda9cb1de9b4bb14eb228]
# to [16c2de032af09ab4f527934bd49762523cb2d3bc]
#
# patch "packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb"
# from [58d54d89114cdd3627fb569c1523dfcfecdfcd86]
# to [e708a8d6cdf7eba6f680a1cd696396adcdab3517]
#
# patch "packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb"
# from [83636847e2f3799d184bc0748eee686270a61c79]
# to [d0ff8b4ceeb0e382d68cfb2d7c93a44c3c848ed8]
#
# patch "packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb"
# from [96f40a33b74048e73d3054500e402469dc47f737]
# to [ecb7bdd88141efe8406a5d86de1c5c26340090c9]
#
# set "packages/xcursor-transparent-theme/xcursor-watchonly-theme/20xcursor-transparent"
# attr "mtn:execute"
# value "true"
#
============================================================
--- packages/gpe-scap/gpe-scap-1.3/allow-glade-2.4.0.patch 3fca637842d4f56756161b44d99ea894218489ab
+++ packages/gpe-scap/gpe-scap-1.3/allow-glade-2.4.0.patch 3fca637842d4f56756161b44d99ea894218489ab
@@ -0,0 +1,26 @@
+Index: gpe-scap-1.3/configure
+===================================================================
+--- gpe-scap-1.3.orig/configure 2008-01-17 17:01:49.000000000 +0100
++++ gpe-scap-1.3/configure 2008-01-17 17:03:01.000000000 +0100
+@@ -6327,7 +6327,7 @@
+
+
+
+-GLADE_MODULES="libglade-2.0 >= 2.4.2"
++GLADE_MODULES="libglade-2.0 >= 2.4.0"
+
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for GLADE" >&5
+Index: gpe-scap-1.3/configure.ac
+===================================================================
+--- gpe-scap-1.3.orig/configure.ac 2008-01-17 17:35:15.000000000 +0100
++++ gpe-scap-1.3/configure.ac 2008-01-17 17:35:20.000000000 +0100
+@@ -29,7 +29,7 @@
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+
+-GLADE_MODULES="libglade-2.0 >= 2.4.2"
++GLADE_MODULES="libglade-2.0 >= 2.4.0"
+ PKG_CHECK_MODULES(GLADE, $GLADE_MODULES)
+ AC_SUBST(GLADE_CFLAGS)
+ AC_SUBST(GLADE_LIBS)
============================================================
--- packages/linux/chumby-kernel/chumby-override-cmdline.patch 8305fa51831e4f5f03145b9ab02e8829bed237e7
+++ packages/linux/chumby-kernel/chumby-override-cmdline.patch 8305fa51831e4f5f03145b9ab02e8829bed237e7
@@ -0,0 +1,13 @@
+Index: linux-2.6.16/arch/arm/kernel/setup.c
+===================================================================
+--- linux-2.6.16.orig/arch/arm/kernel/setup.c 2008-01-17 21:49:50.000000000 +0100
++++ linux-2.6.16/arch/arm/kernel/setup.c 2008-01-17 22:20:40.000000000 +0100
+@@ -660,7 +660,7 @@
+
+ static int __init parse_tag_cmdline(const struct tag *tag)
+ {
+- strlcpy(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE);
++ //strlcpy(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE);
+ return 0;
+ }
+
============================================================
--- packages/rt2x00/rt73-chumby_1.2.bb 96ccbba0b9b10dc2424492a1baa986c6a2f1944c
+++ packages/rt2x00/rt73-chumby_1.2.bb 96ccbba0b9b10dc2424492a1baa986c6a2f1944c
@@ -0,0 +1,21 @@
+DESCRIPTION = "Driver for Ralink rt73 USB 802.11g WiFi sticks found in the Chumby"
+HOMEPAGE = "http://www.chumby.com"
+SECTION = "kernel/modules"
+LICENSE = "GPL"
+PR = "r2"
+
+SRC_URI="http://files.chumby.com/source/ironforge/build396/${PN}-${PV}.tar.gz"
+
+inherit module
+
+S = "${WORKDIR}/wifi/rt73/Module/"
+
+EXTRA_OEMAKE = "KERNDIR=${STAGING_KERNEL_DIR}"
+
+do_install() {
+ install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
+ install -m 0644 rt73${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra/
+ install -d ${D}${sysconfdir}/Wireless/RT73STA/
+ install -m 0644 rt73.bin ${D}${sysconfdir}/Wireless/RT73STA/
+}
+
============================================================
--- packages/xcursor-transparent-theme/xcursor-watchonly-theme/20xcursor-transparent a5b22f1aa71c4d2079e2875c22ecfb1735d68612
+++ packages/xcursor-transparent-theme/xcursor-watchonly-theme/20xcursor-transparent a5b22f1aa71c4d2079e2875c22ecfb1735d68612
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Only if there's no mouse at all, we use use transparent cursors
+# for stylus use comfort.
+if ! ls /dev/input/mouse* >/dev/null 2>&1; then
+ echo "Xcursor.theme: xcursor-transparent" | xrdb -merge -nocpp
+fi
============================================================
--- packages/xcursor-transparent-theme/xcursor-watchonly-theme/skip_watch_cursor.patch 6b2c049ef8e46368a7a8c9d7cfac98a1eff1c03c
+++ packages/xcursor-transparent-theme/xcursor-watchonly-theme/skip_watch_cursor.patch 6b2c049ef8e46368a7a8c9d7cfac98a1eff1c03c
@@ -0,0 +1,23 @@
+diff -NurP xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.am xcursor-transparent-theme-0.1.1/cursors/Makefile.am
+--- xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.am 2003-10-30 13:13:59.000000000 +0100
++++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am 2005-12-20 23:35:17.000000000 +0100
+@@ -79,7 +79,6 @@
+ ul_angle \
+ ur_angle \
+ v_double_arrow \
+- watcha \
+ xterm
+
+ CURSOR_DIR = $(datadir)/icons/xcursor-transparent/cursors
+diff -NurP xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.in xcursor-transparent-theme-0.1.1/cursors/Makefile.in
+--- xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.in 2003-10-31 15:31:13.000000000 +0100
++++ xcursor-transparent-theme-0.1.1/cursors/Makefile.in 2005-12-20 23:35:36.000000000 +0100
+@@ -67,7 +67,7 @@
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+
+-CURSOR_NAMES = 00008160000006810000408080010102 028006030e0e7ebffc7f7070c0600140 03b6e0fcb3499374a867c041f52298f0 08e8e1c95fe2fc01f976f1e063a24ccd 14fef782d02440884392942c11205230 2870a09082c103050810ffdffffe0204 3ecb610c1bf2410f44200f48c40d3599 4498f0e0c1937ffe01fd06f973665830 9d800788f1b08800ae810202380a0822 c7088f0f3e6c8088236ef8e1e3e70000 d9ce0ab605698f320427677b458ad60b e29285e634086352946a0e7090d73106 fcf1c3c7cd4491d801f1e1c78f100000 X_cursor arrow base_arrow_down base_arrow_up based_arrow_down based_arrow_up bd_double_arrow boat bottom_left_corner bottom_right_corner bottom_side bottom_tee center_ptr circle cross cross_reverse crossed_circle crosshair dot dot_box_mask dotbox double_arrow draft_large draft_small draped_box exchange fd_double_arrow fleur gumby h_double_arrow hand hand1 hand2 left_ptr left_ptr_watch left_side left_tee ll_angle lr_angle move pencil pirate plus question_arrow right_ptr right_side right_tee sailboat sb_down_arrow sb_h_double_arrow sb_left_arrow sb_right_arrow sb_up_arrow sb_v_double_arrow shuttle sizing target tcross top_left_arrow top_left_corner top_right_corner top_side top_tee trek ul_angle ur_angle v_double_arrow watcha xterm
++CURSOR_NAMES = 00008160000006810000408080010102 028006030e0e7ebffc7f7070c0600140 03b6e0fcb3499374a867c041f52298f0 08e8e1c95fe2fc01f976f1e063a24ccd 14fef782d02440884392942c11205230 2870a09082c103050810ffdffffe0204 3ecb610c1bf2410f44200f48c40d3599 4498f0e0c1937ffe01fd06f973665830 9d800788f1b08800ae810202380a0822 c7088f0f3e6c8088236ef8e1e3e70000 d9ce0ab605698f320427677b458ad60b e29285e634086352946a0e7090d73106 fcf1c3c7cd4491d801f1e1c78f100000 X_cursor arrow base_arrow_down base_arrow_up based_arrow_down based_arrow_up bd_double_arrow boat bottom_left_corner bottom_right_corner bottom_side bottom_tee center_ptr circle cross cross_reverse crossed_circle crosshair dot dot_box_mask dotbox double_arrow draft_large draft_small draped_box exchange fd_double_arrow fleur gumby h_double_arrow hand hand1 hand2 left_ptr left_ptr_watch left_side left_tee ll_angle lr_angle move pencil pirate plus question_arrow right_ptr right_side right_tee sailboat sb_down_arrow sb_h_double_arrow sb_left_arrow sb_right_arrow sb_up_arrow sb_v_double_arrow shuttle sizing target tcross top_left_arrow top_left_corner top_right_corner top_side top_tee trek ul_angle ur_angle v_double_arrow xterm
+
+
+ CURSOR_DIR = $(datadir)/icons/xcursor-transparent/cursors
============================================================
--- conf/machine/chumby.conf 83ab431ac03a48b06b82de26db56cd04bf9a912a
+++ conf/machine/chumby.conf 3d7a9c183a4567571b4914f1a614545e5029b69c
@@ -11,6 +11,11 @@ PREFERRED_PROVIDER_virtual/kernel = "${M
PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
+MACHINE_EXTRA_RRECOMMENDS = "\
+ kernel-modules \
+ rt73-chumby \
+"
+
require conf/machine/include/tune-arm926ejs.inc
# used by sysvinit_2
@@ -18,3 +23,8 @@ ROOT_FLASH_SIZE = "22"
# used by opie-collections.inc
ROOT_FLASH_SIZE = "22"
+
+# extra jffs2 tweaks
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
+
+IMAGE_FSTYPES += "cramfs"
============================================================
--- conf/machine/fic-gta02.conf 47adecd1ee4496da827ee13c515774484b0373ec
+++ conf/machine/fic-gta02.conf 9c53b1252d1b563a297e0d6174f4eb462b003de1
@@ -35,7 +35,11 @@ ROOT_FLASH_SIZE = "256"
ROOT_FLASH_SIZE = "256"
# extra jffs2 tweaks
-EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
+ --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \
+ --littleendian --pad \
+ -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary"
# build / upload tools
EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"
============================================================
--- packages/gnutls/gnutls.inc cc20d75c7e1753143d7a8fd4b2ec7fc8a708868a
+++ packages/gnutls/gnutls.inc 684fa353da238f622dd47843a2ab39f725289869
@@ -1,13 +1,10 @@ LICENSE = "LGPL"
DESCRIPTION = "GNU Transport Layer Security Library"
HOMEPAGE = "http://www.gnu.org/software/gnutls/"
DEPENDS = "zlib libgcrypt lzo"
LICENSE = "LGPL"
-SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \
- file://gnutls-openssl.patch;patch=1 \
- file://gnutls-texinfo-euro.patch;patch=1 \
- file://configure_madness.patch;patch=1 "
+SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2"
inherit autotools binconfig pkgconfig
============================================================
--- packages/gnutls/gnutls_1.6.3.bb dbb7cf9f7c57730e2f8cac2d3f4c14485a44bf85
+++ packages/gnutls/gnutls_1.6.3.bb 00f6ee42f807520ea4255904e757ed8cd210a4da
@@ -1,2 +1,9 @@ require gnutls.inc
require gnutls.inc
+
+SRC_URI += "\
+ file://gnutls-openssl.patch;patch=1 \
+ file://gnutls-texinfo-euro.patch;patch=1 \
+ file://configure_madness.patch;patch=1 \
+ "
+
PR = "r3"
============================================================
--- packages/gpe-scap/gpe-scap_1.3.bb ea05f8ee476d853b1883d58d4bc62e8d23ba9041
+++ packages/gpe-scap/gpe-scap_1.3.bb 73e961b984f8eaea1c3a6678341b1484dd688c22
@@ -11,3 +11,5 @@ inherit gpe autotools
GPE_TARBALL_SUFFIX = "bz2"
inherit gpe autotools
+
+SRC_URI += " file://allow-glade-2.4.0.patch;patch=1"
============================================================
--- packages/gpe-session-scripts/files/angstrom/matchbox-session 5f2775906eeda8b22303d2452c158ba979a9595d
+++ packages/gpe-session-scripts/files/angstrom/matchbox-session cd7ffc92541caae372d21de0550aacc7d535d533
@@ -1,8 +1,6 @@
#!/bin/sh
-XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1`
+#XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1`
+matchbox-desktop &
+matchbox-panel --no-flip --orientation south &
- matchbox-desktop &
-
-matchbox-panel --no-flip --orientation south &
-
============================================================
--- packages/gpe-session-scripts/files/matchbox-session 5c0f9302bc62e8b8612888f54ec5d2c9300d75ab
+++ packages/gpe-session-scripts/files/matchbox-session 864395d7fb408233687a04db272c51799b6d5d5d
@@ -1,8 +1,6 @@
#!/bin/sh
-XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1`
+#XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1`
+matchbox-desktop &
+MB_MENU_PANEL_DISABLED=1 matchbox-panel --orientation south &
- matchbox-desktop &
-
-MB_MENU_PANEL_DISABLED=1 matchbox-panel --orientation south &
-
============================================================
--- packages/gpe-session-scripts/gpe-session-scripts_0.67.bb e886f9c3d56e6dba00f20b02fdb8cff205713397
+++ packages/gpe-session-scripts/gpe-session-scripts_0.67.bb b9030ecb91f1a88e063dc31e35f8a61d905d29eb
@@ -11,7 +11,7 @@ SRC_URI += "file://matchbox-session \
SRC_URI += "file://matchbox-session \
file://disable-composite.xsettings"
-PR = "r10"
+PR = "r11"
#apply a patch to set the fontsize for bigdpi (200+) devices to 5
SRC_URI_append_hx4700 = " file://highdpifontfix.patch;patch=1"
============================================================
--- packages/linux/chumby-kernel/defconfig 28b9bde031eb6f049b7dda9cb1de9b4bb14eb228
+++ packages/linux/chumby-kernel/defconfig 16c2de032af09ab4f527934bd49762523cb2d3bc
@@ -766,7 +766,7 @@ CONFIG_DUMMY_CONSOLE=y
#
# CONFIG_VGA_CONSOLE is not set
CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=m
+CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
CONFIG_FONTS=y
CONFIG_FONT_8x8=y
@@ -783,8 +783,8 @@ CONFIG_FONT_MINI_4x6=y
#
# Logo configuration
#
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
+# CONFIG_LOGO is not set
+# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
# CONFIG_LOGO_LINUX_CLUT224 is not set
# CONFIG_LOGO_TURBOCHEF_CLUT224 is not set
@@ -895,7 +895,7 @@ CONFIG_USB_LIBUSUAL=y
#
# USB Input Devices
#
-CONFIG_USB_HID=m
+CONFIG_USB_HID=y
CONFIG_USB_HIDINPUT=y
# CONFIG_USB_HIDINPUT_POWERBOOK is not set
# CONFIG_HID_FF is not set
@@ -1033,9 +1033,9 @@ CONFIG_UDF_NLS=y
#
# DOS/FAT/NT Filesystems
#
-CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
CONFIG_FAT_DEFAULT_CODEPAGE=437
CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
# CONFIG_NTFS_FS is not set
============================================================
--- packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb 58d54d89114cdd3627fb569c1523dfcfe%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r6fdc0cb19db57ac2a4d88dec24b554f7b34c593d -r2eadd91fadb429f90d6d5b0714a7265811f206b6
#
#
#
# delete "packages/e17/e-wm_0.16.999.038.bb"
#
# add_file "packages/e17/e-wm_cvs.bb"
# content [529ec72e179f26986c7e4391d4699e598b77096a]
#
# patch "packages/e17/e-utils_cvs.bb"
# from [e6eb282e49d65f3e06eb55ea717c134fba7af668]
# to [13eda31345812ee61f2c570492ae524db13ae518]
#
# patch "packages/e17/e-wm_0.16.999.041.bb"
# from [5b5487dd36444b2311993eda6fd92201cc77756c]
# to [3e2fd3edf15b79ca5ab6153ffedff83c9a4377d9]
#
# patch "packages/e17/edje-editor_cvs.bb"
# from [cfa6ec43d5f9faae882abbe2efa486f7fa6523f3]
# to [534fc5e91d55fb8c29bd354a5e05e3cea2306190]
#
# patch "packages/e17/edje-viewer_cvs.bb"
# from [81171cf34f4ee80dedbbea9870abd1936cd37058]
# to [c67aeed187c3498ae31201e23527742188a003ff]
#
# patch "packages/e17/entice_cvs.bb"
# from [274be844e586453c60181c552aaf67eaa4ce68f0]
# to [33eec12af3a8a595505dee84d6347f9b5838ecf0]
#
# patch "packages/e17/entrance_0.9.0.010.bb"
# from [ed458d1dc2cf8825ad4757aebd77cb0b2b29e7db]
# to [3a66d6b8fa5fb38b7fd0bb185a6767b5b47343ed]
#
# patch "packages/e17/examine_cvs.bb"
# from [870495278ea331e527bb9645ba0d19caec0672c8]
# to [61fe2242600f8ed7c398a64d329d89d6208c6a10]
#
# patch "packages/e17/exhibit_cvs.bb"
# from [0fb73195eb74fba616a7e95d1b0fc13facb15932]
# to [692c70acbd1a0589a77ca74304075419d2c345f4]
#
# patch "packages/e17/expedite_cvs.bb"
# from [a3eb9e6385c5b2460ac7c5d0c3509a4e97e5820f]
# to [cfee447f9ceb3541ddb38d005d85add8ae8ad60b]
#
# patch "packages/e17/rage_0.2.0.005.bb"
# from [be8c5ba108c7b91ce0516d15c10fa44c67f9be4d]
# to [04c645b7d3b04bcdf13b9188cb1283d991a72e39]
#
# patch "packages/efl1/ecore-native_cvs.bb"
# from [4a00d1d0cad23d61b7411ae50b847f83086398ce]
# to [5bd60a7af1398231f76c6398fe56302fd0365b70]
#
# patch "packages/efl1/ecore_cvs.bb"
# from [e5059f4bf4f7c76e1c65effb2dcd11b7e18a4c0c]
# to [d5252beb6447db426e62970a50a59407b9c1dc8b]
#
# patch "packages/efl1/edbus_cvs.bb"
# from [c1a0f93864dece01ef62aab214eb056162154ffa]
# to [132848ec2182987753b4827a0c27d567ca12cce7]
#
# patch "packages/efl1/edje-native_cvs.bb"
# from [61b907b3153cd9a90f2727727c2eb99ff6a16c59]
# to [3af2a3c86daed707172b160f5352e4e1f92518ed]
#
# patch "packages/efl1/edje_cvs.bb"
# from [354d625fd1e123d1629c55a11d24421decfc22a5]
# to [ac767ddd6ef3e33594e36c32d80fcb551a3bb380]
#
# patch "packages/efl1/eet_cvs.bb"
# from [63e1fa0da683beda5648ae75c2cc04153f06b92b]
# to [869675713b0e92b00b79fd8ff8fe0bbd329e76cc]
#
# patch "packages/efl1/efreet_cvs.bb"
# from [9493180d2ccf9d967fe7bd6096988708028f0eb0]
# to [5fa16dafdd558aa8bf82a006243cb7c86950003a]
#
# patch "packages/efl1/embryo_cvs.bb"
# from [be59294be518936cb4e0986abd744b4a70e86e3e]
# to [3004da545ec73d718d11b18e16c97a533af9ae75]
#
# patch "packages/efl1/evas.inc"
# from [cc99e778d7f3640905f0dc835736906c5393874c]
# to [b5cd048c85bc9f9f299682fb9fc1db9a8a381a45]
#
# patch "packages/efl1/evas_cvs.bb"
# from [7ac3a08c9fc17a3cc7a34dc582fc93b978ab9144]
# to [8c14a37af3d4c6356ba37624a420d4dc7b485196]
#
============================================================
--- packages/e17/e-wm_cvs.bb 529ec72e179f26986c7e4391d4699e598b77096a
+++ packages/e17/e-wm_cvs.bb 529ec72e179f26986c7e4391d4699e598b77096a
@@ -0,0 +1,61 @@
+DESCRIPTION = "E17 - the Enlightenment Window Mananger"
+DEPENDS = "eet evas ecore edje efreet"
+LICENSE = "MIT BSD"
+PV = "0.16.999.041+cvs${SRCDATE}"
+PR = "r0"
+
+inherit e update-alternatives
+
+SRC_URI = "${E_CVS};module=e17/apps/e \
+ file://Xsession.d/98enlightenment \
+ file://applications.menu \
+ file://Makefile.in.in \
+"
+S = "${WORKDIR}/e"
+
+EXTRA_OECONF = "\
+ --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
+ --x-includes=${STAGING_INCDIR}/X11 \
+ --x-libraries=${STAGING_LIBDIR} \
+ --enable-simple-x11 \
+"
+
+do_configure_prepend() {
+ install -m 0644 ${WORKDIR}/Makefile.in.in po/
+ echo "install -d $*" >./mkinstalldirs
+ chmod a+rx ./mkinstalldirs
+}
+
+do_stage() {
+ autotools_stage_all
+ for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.la" -print`; do rm -f $I; done
+ for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.a" -print`; do rm -f $I; done
+ for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.la" -print`; do rm -f $I; done
+ for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.a" -print`; do rm -f $I; done
+}
+
+do_install_append() {
+ # customising - should rather make this simple upstream
+ 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/
+}
+
+FILES_${PN} = "\
+ ${bindir}/* \
+ ${libdir}/enlightenment/modules/*/*.* \
+ ${libdir}/enlightenment/modules/*/*/* \
+ ${libdir}/enlightenment/preload/*.so \
+ ${datadir} \
+ ${sysconfdir} \
+"
+FILES_${PN}-dbg += "\
+ ${libdir}/enlightenment/modules/*/*/.debug/ \
+ ${libdir}/enlightenment/preload/.debug/ \
+"
+
+ALTERNATIVE_PATH = "${bindir}/enlightenment_start"
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PRIORITY = "16"
============================================================
--- packages/e17/e-utils_cvs.bb e6eb282e49d65f3e06eb55ea717c134fba7af668
+++ packages/e17/e-utils_cvs.bb 13eda31345812ee61f2c570492ae524db13ae518
@@ -1,6 +1,6 @@ DEPENDS = "eet evas ecore edje esmart ew
DESCRIPTION = "Enlightenment Window Manager Utilities"
DEPENDS = "eet evas ecore edje esmart ewl engrave"
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
PV = "0.0.0+cvs${SRCDATE}"
PR = "r0"
============================================================
--- packages/e17/e-wm_0.16.999.041.bb 5b5487dd36444b2311993eda6fd92201cc77756c
+++ packages/e17/e-wm_0.16.999.041.bb 3e2fd3edf15b79ca5ab6153ffedff83c9a4377d9
@@ -1,8 +1,10 @@ DEPENDS = "eet evas ecore edje efreet"
DESCRIPTION = "E17 - the Enlightenment Window Mananger"
DEPENDS = "eet evas ecore edje efreet"
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
PR = "r0"
+DEFAULT_PREFERENCE = "-1"
+
inherit e update-alternatives
SRC_URI = "http://download.enlightenment.org/snapshots/2007-08-26/enlightenment-${PV}.tar.gz \
============================================================
--- packages/e17/edje-editor_cvs.bb cfa6ec43d5f9faae882abbe2efa486f7fa6523f3
+++ packages/e17/edje-editor_cvs.bb 534fc5e91d55fb8c29bd354a5e05e3cea2306190
@@ -1,5 +1,5 @@ DESCRIPTION = "Edje-Editor is just that.
DESCRIPTION = "Edje-Editor is just that."
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
DEPENDS = "etk"
PV = "0.0.0+cvs${SRCDATE}"
PR = "r0"
============================================================
--- packages/e17/edje-viewer_cvs.bb 81171cf34f4ee80dedbbea9870abd1936cd37058
+++ packages/e17/edje-viewer_cvs.bb c67aeed187c3498ae31201e23527742188a003ff
@@ -1,6 +1,6 @@ DEPENDS = "etk"
DESCRIPTION = "Edje_Viewer is just that."
DEPENDS = "etk"
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
PV = "0.0.0+cvs${SRCDATE}"
PR = "r3"
============================================================
--- packages/e17/entice_cvs.bb 274be844e586453c60181c552aaf67eaa4ce68f0
+++ packages/e17/entice_cvs.bb 33eec12af3a8a595505dee84d6347f9b5838ecf0
@@ -1,6 +1,6 @@ DESCRIPTION = "Entice is the E17 picture
DESCRIPTION = "Entice is the E17 picture viewer"
# can also depend on GIMP for editing
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
DEPENDS = "edb evas ecore edje epsilon esmart"
PV = "0.0.0+cvs${SRCDATE}"
PR = "r0"
============================================================
--- packages/e17/entrance_0.9.0.010.bb ed458d1dc2cf8825ad4757aebd77cb0b2b29e7db
+++ packages/e17/entrance_0.9.0.010.bb 3a66d6b8fa5fb38b7fd0bb185a6767b5b47343ed
@@ -1,5 +1,5 @@ DESCRIPTION = "Entrance is the Enlighten
DESCRIPTION = "Entrance is the Enlightenment login manager"
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
# can also use pam and crypt
DEPENDS = "evas ecore edje esmart bash keylaunch xserver-common login-manager"
RDEPENDS += "glibc-gconv-iso8859-1 entrance-themes"
============================================================
--- packages/e17/examine_cvs.bb 870495278ea331e527bb9645ba0d19caec0672c8
+++ packages/e17/examine_cvs.bb 61fe2242600f8ed7c398a64d329d89d6208c6a10
@@ -1,6 +1,6 @@ DEPENDS = "ewl"
DESCRIPTION = "Examine, the program configurator"
DEPENDS = "ewl"
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
PV = "0.0.0+cvs${SRCDATE}"
PR = "r0"
============================================================
--- packages/e17/exhibit_cvs.bb 0fb73195eb74fba616a7e95d1b0fc13facb15932
+++ packages/e17/exhibit_cvs.bb 692c70acbd1a0589a77ca74304075419d2c345f4
@@ -1,6 +1,6 @@ DEPENDS = "evas ecore epsilon edje eet e
DESCRIPTION = "Exhibit is the ETK picture viewer"
DEPENDS = "evas ecore epsilon edje eet etk efreet"
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
PV = "0.0.0+cvs${SRCDATE}"
PR = "r0"
============================================================
--- packages/e17/expedite_cvs.bb a3eb9e6385c5b2460ac7c5d0c3509a4e97e5820f
+++ packages/e17/expedite_cvs.bb cfee447f9ceb3541ddb38d005d85add8ae8ad60b
@@ -1,7 +1,7 @@ RDEPENDS = "libevas-engine-buffer libeva
DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas"
DEPENDS = "eet evas"
RDEPENDS = "libevas-engine-buffer libevas-engine-fb libevas-engine-software-generic libevas-engine-software-x11 libevas-loader-png"
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
PV = "0.6.0+cvs${SRCDATE}"
PR = "r0"
@@ -11,9 +11,25 @@ S = "${WORKDIR}/${PN}"
file://hack-disable-opengl.patch;patch=1"
S = "${WORKDIR}/${PN}"
+EXTRA_OECONF = "\
+ --x-includes=${STAGING_INCDIR}/X11 \
+ --x-libraries=${STAGING_LIBDIR} \
+ --enable-simple-x11 \
+\
+ --disable-opengl-glew \
+ --disable-opengl-x11 \
+ --enable-software-x11 \
+ --enable-xrender-x11 \
+ --enable-software-16-x11 \
+ --enable-fb \
+ --disable-software-ddraw \
+ --disable-software-16-ddraw \
+ --disable-direct3d \
+ --disable-software-sdl \
+"
+
do_configure_append() {
find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
}
FILES_${PN} += "${datadir}"
-
============================================================
--- packages/e17/rage_0.2.0.005.bb be8c5ba108c7b91ce0516d15c10fa44c67f9be4d
+++ packages/e17/rage_0.2.0.005.bb 04c645b7d3b04bcdf13b9188cb1283d991a72e39
@@ -1,11 +1,10 @@ HOMEPAGE = "http://www.rasterman.com"
DESCRIPTION = "Rage is a media center application based on EFL"
AUTHOR = "Carsten 'The Rasterman' Heitzler"
HOMEPAGE = "http://www.rasterman.com"
-LICENSE = "GPL"
+LICENSE = "MIT BSD"
DEPENDS = "evas ecore edje"
SECTION = "x11/multimedia"
SRC_URI = "http://download.enlightenment.org/snapshots/2007-08-26/rage-${PV}.tar.gz"
inherit autotools
-
============================================================
--- packages/efl1/ecore-native_cvs.bb 4a00d1d0cad23d61b7411ae50b847f83086398ce
+++ packages/efl1/ecore-native_cvs.bb 5bd60a7af1398231f76c6398fe56302fd0365b70
@@ -1,10 +1,14 @@ DEPENDS = "eet-native evas-native"
require ecore.inc
inherit native
DEPENDS = "eet-native evas-native"
-PR = "r0"
+PR = "r2"
EXTRA_OECONF = "\
+ --x-includes=${STAGING_INCDIR}/X11 \
+ --x-libraries=${STAGING_LIBDIR} \
+ \
--enable-ecore-txt \
+ --disable-ecore-config \
--disable-ecore-x-xcb \
--disable-ecore-x \
--enable-ecore-job \
@@ -12,7 +16,7 @@ EXTRA_OECONF = "\
--disable-ecore-sdl \
--enable-ecore-fb \
--enable-ecore-evas \
- --disable-ecore-evas-gl \
+ --disable-ecore-evas-x11-gl \
--disable-ecore-evas-xrender \
--disable-ecore-evas-dfb \
--disable-openssl \
@@ -24,6 +28,6 @@ EXTRA_OECONF = "\
--disable-poll \
--disable-curl \
--disable-ecore-desktop \
+ --disable-ecore-imf \
+ --disable-ecore-imf_evas \
+"
- --x-includes=${STAGING_INCDIR}/X11 \
- --x-libraries=${STAGING_LIBDIR} "
-
============================================================
--- packages/efl1/ecore_cvs.bb e5059f4bf4f7c76e1c65effb2dcd11b7e18a4c0c
+++ packages/efl1/ecore_cvs.bb d5252beb6447db426e62970a50a59407b9c1dc8b
@@ -1,19 +1,23 @@ require ecore.inc
require ecore.inc
-PR = "r1"
+PR = "r2"
EXTRA_OECONF = "\
+ --x-includes=${STAGING_INCDIR}/X11 \
+ --x-libraries=${STAGING_LIBDIR} \
+ --enable-simple-x11 \
+\
--enable-ecore-txt \
+ --enable-ecore-config \
--disable-ecore-x-xcb \
- --enable-simple-x11 \
--enable-ecore-x \
--enable-ecore-job \
--disable-ecore-directfb \
--disable-ecore-sdl \
--enable-ecore-fb \
--enable-ecore-evas \
- --disable-ecore-evas-x11-gl \
+ --disable-ecore-evas-x11-gl \
--enable-ecore-evas-xrender \
- --enable-ecore-evas-dfb \
+ --disable-ecore-evas-dfb \
--disable-openssl \
--enable-abstract-sockets \
--enable-ecore-con \
@@ -22,6 +26,5 @@ EXTRA_OECONF = "\
--enable-inotify \
--disable-poll \
--enable-curl \
+ --disable-ecore-desktop \
+"
- --enable-ecore-desktop \
- --x-includes=${STAGING_INCDIR}/X11 \
- --x-libraries=${STAGING_LIBDIR} "
============================================================
--- packages/efl1/edbus_cvs.bb c1a0f93864dece01ef62aab214eb056162154ffa
+++ packages/efl1/edbus_cvs.bb 132848ec2182987753b4827a0c27d567ca12cce7
@@ -1,18 +1,15 @@ DEPENDS = "dbus ecore"
DESCRIPTION = "DBus and HAL convenience wrappers for EFL"
DEPENDS = "dbus ecore"
-LICENSE = "MIT"
-PR = "r1"
+LICENSE = "MIT BSD"
+PR = "r2"
inherit efl_library
SRC_URI = "${E_CVS};module=e17/libs/e_dbus"
S = "${WORKDIR}/e_dbus"
-# TODO increase package granularity
-
PACKAGES =+ "${PN}-enotify ${PN}-edbus ${PN}-enm ${PN}-ehal"
FILES_${PN}-enotify = "${libdir}/libenotify.so.*"
FILES_${PN}-edbus = "${libdir}/libedbus.so.*"
FILES_${PN}-enm = "${libdir}/libenm.so.*"
FILES_${PN}-ehal = "${libdir}/libehal.so.*"
-
============================================================
--- packages/efl1/edje-native_cvs.bb 61b907b3153cd9a90f2727727c2eb99ff6a16c59
+++ packages/efl1/edje-native_cvs.bb 3af2a3c86daed707172b160f5352e4e1f92518ed
@@ -1,9 +1,8 @@ DEPENDS = "evas-native ecore-native eet-
require edje_${PV}.bb
inherit native
PR = "r0"
DEPENDS = "evas-native ecore-native eet-native embryo-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje"
do_configure_prepend() {
sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c
============================================================
--- packages/efl1/edje_cvs.bb 354d625fd1e123d1629c55a11d24421decfc22a5
+++ packages/efl1/edje_cvs.bb ac767ddd6ef3e33594e36c32d80fcb551a3bb380
@@ -1,11 +1,11 @@ DEPENDS = "eet evas ecore embryo edje-na
DESCRIPTION = "Edje is a complex graphical design & layout library."
# can also install vim data files
DEPENDS = "eet evas ecore embryo edje-native"
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
PV = "0.5.0.41+cvs${SRCDATE}"
-PR = "r0"
+PR = "r2"
inherit efl_library
+PACKAGES =+ "${PN}-tools"
+FILES_${PN}-tools = "${bindir}/edje_*"
-# NOTE: Packaging needs work. edje_cc should actually be in the -dev package etc.
-
============================================================
--- packages/efl1/eet_cvs.bb 63e1fa0da683beda5648ae75c2cc04153f06b92b
+++ packages/efl1/eet_cvs.bb 869675713b0e92b00b79fd8ff8fe0bbd329e76cc
@@ -1,10 +1,10 @@ DEPENDS = "zlib jpeg"
DESCRIPTION = "EET is a tiny library designed to write an \
arbitary set of chunks of data to a file and optionally compress \
each chunk (very much like a zip file) and allow fast \
random-access reading of the file later on."
DEPENDS = "zlib jpeg"
-LICENSE = "BSD"
+LICENSE = "MIT BSD"
PV = "0.9.10.041+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
inherit efl_library
============================================================
--- packages/efl1/efreet_cvs.bb 9493180d2ccf9d967fe7bd6096988708028f0eb0
+++ packages/efl1/efreet_cvs.bb 5fa16dafdd558aa8bf82a006243cb7c86950003a
@@ -1,7 +1,7 @@ DEPENDS = "ecore"
DESCRIPTION = "An implementation of freedesktop.org specs for the \
Enlightenment Foundation Libraries"
DEPENDS = "ecore"
-LICENSE = "BSD"
+LICENSE = "MIT BSD"
PV = "0.%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list