org.openembedded.dev: a9af97a0d7d40825f32be70ec5fdc7757c965989
oe at monotone.openmoko.org
oe at monotone.openmoko.org
Fri May 2 21:02:58 CEST 2008
revision: a9af97a0d7d40825f32be70ec5fdc7757c965989
date: 2008-04-30T11:45:25
author: oe at openembedded.org
branch: org.openembedded.dev
changelog:
merge of '26a2db272eb8a8c45759850000cba2e07e5de47e'
and 'c7279b542db917aa1365c575fa3b2d81439abf03'
manifest:
format_version "1"
new_manifest [ab64ea0d01c832c7cbdf212cb4ce830ee044029b]
old_revision [26a2db272eb8a8c45759850000cba2e07e5de47e]
add_file "packages/binutils/binutils-2.17/binutils-2.17.atmel.1.2.6.patch.bz2"
content [61afa951e7c1dbe064e1134cfd7c2c4e9f919fb7]
add_file "packages/gcc/gcc-4.2.2/901-avr32-no-cond-exec-before-reload-by-default.patch"
content [a993a533b9e9b03a015aae1cbf427aa4e7f323e7]
add_file "packages/gcc/gcc-4.2.2/gcc-4.2.2.atmel.1.0.8.patch.bz2"
content [65d3733847d1b916ba3fafcf88127711a6fec8ba]
patch "conf/distro/angstrom-2008.1.conf"
from [6f251e8e8c830f7c3e1ebbed08e46a6c642556d9]
to [dd2138b465f663603f99ce6be674dfd46af8c33f]
patch "conf/distro/include/angstrom-uclibc.inc"
from [bd467a8983d81901f98163052c0537bbf2909f15]
to [ed3615a8cce5b329c1b4354ca91a98190a64f862]
patch "packages/binutils/binutils.inc"
from [f448bed26fe1742f47791f2fa478603cc6c038b5]
to [ec08872ebf090adf38f8ae73969a35b3cf0f98ae]
patch "packages/binutils/binutils_2.17.bb"
from [22565b10082a0e16f29e89a55311c299acbc31c1]
to [99e9c269f46aafaced069158eb736ec2b3c100b9]
patch "packages/gcc/gcc-4.2.2.inc"
from [e1a01a5ff03489319241b841ece209ab4fdcbc72]
to [6281a032714b397b43955b47208a1dd89efdd74b]
patch "packages/gdb/gdb-cross.inc"
from [f22b5bdf741d9b9ce7a69086a1b6ff8dc8383420]
to [535e8f1b07e8d49315fe81676dc70d61700d6c19]
set "packages/binutils/binutils-2.17/binutils-2.17.atmel.1.2.6.patch.bz2"
attr "mtn:manual_merge"
value "true"
set "packages/gcc/gcc-4.2.2/gcc-4.2.2.atmel.1.0.8.patch.bz2"
attr "mtn:manual_merge"
value "true"
old_revision [c7279b542db917aa1365c575fa3b2d81439abf03]
delete "packages/madwifi/madwifi-ng_r1844-20061208.bb"
delete "packages/madwifi/madwifi-ng_r2100-20070210.bb"
delete "packages/madwifi/madwifi-ng_r2156-20070225.bb"
delete "packages/madwifi/madwifi-ng_r2182-20070308.bb"
delete "packages/madwifi/madwifi-ng_r2187-20070309.bb"
delete "packages/madwifi/madwifi-ng_r2518-20070626.bb"
delete "packages/madwifi/madwifi-ng_r2702-20070903.bb"
rename "packages/busybox/busybox-1.9.1"
to "packages/busybox/busybox-1.9.2"
rename "packages/busybox/busybox_1.9.1.bb"
to "packages/busybox/busybox_1.9.2.bb"
add_dir "packages/multitap-pad"
add_dir "packages/multitap-pad/files"
add_dir "packages/netbase/netbase/mpc8313e-rdb"
add_file "conf/distro/include/preferred-om-2008-versions.inc"
content [0741783d8c451adac5e47265611069ee7296c2d7]
add_file "packages/linux/linux-omap2-git/beagleboard/usb-timout.patch"
content [7acb9cec9859f0c448ef4b56bf2ebd12e8b84c2b]
add_file "packages/multitap-pad/files/80multitappad"
content [b613cc7c89d800c205b89dd7013c4b3ba309b319]
add_file "packages/multitap-pad/multitap-pad_svn.bb"
content [8f2b626f58690dd52e509cacab5977c5f52270e2]
add_file "packages/netbase/netbase/mpc8313e-rdb/interfaces"
content [2ece41786062e70093a58ef17e23d35ea084c316]
patch "MAINTAINERS"
from [5556c9277c3381070987310400058abdd5f4c820]
to [df1acfac3b7175de3f71ec85623148d285a64116]
patch "classes/kernel.bbclass"
from [8d92c5a7b6420490dd6b3115e8146b3fc0a0f854]
to [8ed575119a74e50c5bcb39266997cba3f60792c2]
patch "conf/distro/include/sane-srcrevs.inc"
from [af1d08078aa8f03db44e8b150bc4f043ad26b938]
to [3f68781354a48bcde95fae1b91ce841a0f88ae0f]
patch "packages/busybox/busybox-1.9.2/defconfig"
from [f0e872e8e6f3bc9941075571caf38d1a62657458]
to [b98a8c0c48f931c7b67cd67b5498aac228e47b29]
patch "packages/busybox/busybox_1.9.2.bb"
from [4ce3286b8b9f17817880e467425ec28de58ea3f4]
to [a3a8f0f9c2f172464f5e3746ae507d0845fd473f]
patch "packages/freesmartphone/gsm0710muxd_svn.bb"
from [b214341ba255007649e5d97e71b3d22c2218c73e]
to [848b41b51ffadb51a05381fbc015bc38fa1fccb1]
patch "packages/freesmartphone/py-odeviced_svn.bb"
from [6ef92b7c28dc3f0730750da1b7cfeed1cd7da960]
to [30b9953c30c87828378bdcea8213290cc498ea8f]
patch "packages/linux/linux-omap2-git/beagleboard/defconfig"
from [ffa35a912f2d6c8016f6ea1d0f7ebb27987a9b28]
to [6defc6fa96f79492acbfbaed1cc6553abe5edc13]
patch "packages/linux/linux-omap2_git.bb"
from [e84865c7794f8227ce021537e22050f366fe51b3]
to [d2df9d873b73d322c1d6a7918ef9c8786b091e48]
patch "packages/madwifi/madwifi-ng_r3314-20080131.bb"
from [aa87cb14b8005f3b927e4701b1ae845bf2099ec2]
to [24403394f09cfebacade21edca4dbf1c9fe180ba]
patch "packages/meta/slugos-packages.bb"
from [46c8ac8a7503c5e222ee23a677a92db2e2ea9dcb]
to [f62c22f94a5ba8a475afc6d43721c4e29386ca2e]
patch "packages/opkg/opkg_svn.bb"
from [bc27245782ad8e3348db57c3d14c9e75b4f1b404]
to [e034851c3a5985b17cbde739bc5bb59a8c69d323]
-------------- next part --------------
#
#
# add_file "packages/binutils/binutils-2.17/binutils-2.17.atmel.1.2.6.patch.bz2"
# content [61afa951e7c1dbe064e1134cfd7c2c4e9f919fb7]
#
# add_file "packages/gcc/gcc-4.2.2/901-avr32-no-cond-exec-before-reload-by-default.patch"
# content [a993a533b9e9b03a015aae1cbf427aa4e7f323e7]
#
# add_file "packages/gcc/gcc-4.2.2/gcc-4.2.2.atmel.1.0.8.patch.bz2"
# content [65d3733847d1b916ba3fafcf88127711a6fec8ba]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [6f251e8e8c830f7c3e1ebbed08e46a6c642556d9]
# to [dd2138b465f663603f99ce6be674dfd46af8c33f]
#
# patch "conf/distro/include/angstrom-uclibc.inc"
# from [bd467a8983d81901f98163052c0537bbf2909f15]
# to [ed3615a8cce5b329c1b4354ca91a98190a64f862]
#
# patch "packages/binutils/binutils.inc"
# from [f448bed26fe1742f47791f2fa478603cc6c038b5]
# to [ec08872ebf090adf38f8ae73969a35b3cf0f98ae]
#
# patch "packages/binutils/binutils_2.17.bb"
# from [22565b10082a0e16f29e89a55311c299acbc31c1]
# to [99e9c269f46aafaced069158eb736ec2b3c100b9]
#
# patch "packages/gcc/gcc-4.2.2.inc"
# from [e1a01a5ff03489319241b841ece209ab4fdcbc72]
# to [6281a032714b397b43955b47208a1dd89efdd74b]
#
# patch "packages/gdb/gdb-cross.inc"
# from [f22b5bdf741d9b9ce7a69086a1b6ff8dc8383420]
# to [535e8f1b07e8d49315fe81676dc70d61700d6c19]
#
# set "packages/binutils/binutils-2.17/binutils-2.17.atmel.1.2.6.patch.bz2"
# attr "mtn:manual_merge"
# value "true"
#
# set "packages/gcc/gcc-4.2.2/gcc-4.2.2.atmel.1.0.8.patch.bz2"
# attr "mtn:manual_merge"
# value "true"
#
============================================================
# packages/binutils/binutils-2.17/binutils-2.17.atmel.1.2.6.patch.bz2 is binary
============================================================
--- packages/gcc/gcc-4.2.2/901-avr32-no-cond-exec-before-reload-by-default.patch a993a533b9e9b03a015aae1cbf427aa4e7f323e7
+++ packages/gcc/gcc-4.2.2/901-avr32-no-cond-exec-before-reload-by-default.patch a993a533b9e9b03a015aae1cbf427aa4e7f323e7
@@ -0,0 +1,13 @@
+Index: gcc-4.2.2/gcc/config/avr32/avr32.c
+===================================================================
+--- gcc-4.2.2.orig/gcc/config/avr32/avr32.c 2008-04-08 10:42:47.000000000 +0200
++++ gcc-4.2.2/gcc/config/avr32/avr32.c 2008-04-08 10:43:33.000000000 +0200
+@@ -161,7 +161,7 @@
+ /* Set default target_flags. */
+ #undef TARGET_DEFAULT_TARGET_FLAGS
+ #define TARGET_DEFAULT_TARGET_FLAGS \
+- (MASK_HAS_ASM_ADDR_PSEUDOS | MASK_MD_REORG_OPTIMIZATION | MASK_COND_EXEC_BEFORE_RELOAD)
++ (MASK_HAS_ASM_ADDR_PSEUDOS | MASK_MD_REORG_OPTIMIZATION)
+
+ void
+ avr32_optimization_options (int level,
============================================================
# packages/gcc/gcc-4.2.2/gcc-4.2.2.atmel.1.0.8.patch.bz2 is binary
============================================================
--- conf/distro/angstrom-2008.1.conf 6f251e8e8c830f7c3e1ebbed08e46a6c642556d9
+++ conf/distro/angstrom-2008.1.conf dd2138b465f663603f99ce6be674dfd46af8c33f
@@ -119,11 +119,11 @@ require conf/distro/include/preferred-xo
require conf/distro/include/preferred-e-versions.inc
require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
-#avr32 only has patches for binutils 2.17 and gcc 4.2.1 in OE
-PREFERRED_VERSION_gcc_avr32 = "4.2.1"
-PREFERRED_VERSION_gcc-cross_avr32 = "4.2.1"
-PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.2.1"
-PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.2.1"
+#avr32 only has patches for binutils 2.17 and gcc 4.2.2 in OE
+PREFERRED_VERSION_gcc_avr32 = "4.2.2"
+PREFERRED_VERSION_gcc-cross_avr32 = "4.2.2"
+PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.2.2"
+PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.2.2"
PREFERRED_VERSION_binutils_avr32 = "2.17"
PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
============================================================
--- conf/distro/include/angstrom-uclibc.inc bd467a8983d81901f98163052c0537bbf2909f15
+++ conf/distro/include/angstrom-uclibc.inc ed3615a8cce5b329c1b4354ca91a98190a64f862
@@ -16,8 +16,15 @@ BUILD_OPTIMIZATION = "-Os"
BUILD_OPTIMIZATION = "-Os"
#Gcc will die with 'internal consistency error when using the above optimizations
-FULL_OPTIMIZATION_avr32 = ""
-BUILD_OPTIMIZATION_avr32 = ""
+#with gcc-4.2.1-atmel.1.0.3 (and probably most other avr32 gcc ports).
+#However, some packages require optimizations to compile (e.g. libmad).
+#It appears the guilty optimization is "-frename-registers", leaving that one
+#out allows the build to proceed normally. -fexpensive-optimizations may be OK,
+#it was removed while debugging an issue that ultimately turned out to be due
+#to the ICE fixed by gcc-pr32889.patch. It needs to be tested again.
+#Note that this testing was done without the gcc-pr32889.patch.
+FULL_OPTIMIZATION_avr32 = "-Os -fomit-frame-pointer"
+
CXXFLAGS += "-fvisibility-inlines-hidden"
============================================================
--- packages/binutils/binutils.inc f448bed26fe1742f47791f2fa478603cc6c038b5
+++ packages/binutils/binutils.inc ec08872ebf090adf38f8ae73969a35b3cf0f98ae
@@ -67,6 +67,11 @@ do_configure () {
do_configure () {
(cd ${S}; gnu-configize) || die "Failed to run gnu-configize"
+
+ # Fix for issues when system's texinfo version >= 4.10
+ # (See https://bugzilla.redhat.com/show_bug.cgi?id=345621)
+ sed -i -e "s at egrep 'texinfo.*'@egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|4.[1-9][0-9]+|[5-9])'@" '${S}/configure'
+
oe_runconf
#
# must prime config.cache to ensure the build of libiberty
============================================================
--- packages/binutils/binutils_2.17.bb 22565b10082a0e16f29e89a55311c299acbc31c1
+++ packages/binutils/binutils_2.17.bb 99e9c269f46aafaced069158eb736ec2b3c100b9
@@ -1,6 +1,7 @@ require binutils.inc
require binutils.inc
+require binutils-avr32.inc
-PR = "r4"
+PR = "r5"
SRC_URI = \
"http://ftp.gnu.org/gnu/binutils/binutils-${PV}.tar.bz2 \
@@ -18,9 +19,14 @@ SRC_URI += "\
file://300-012_check_ldrunpath_length.patch;patch=1 \
file://300-001_ld_makefile_patch.patch;patch=1 \
file://400-mips-ELF_MAXPAGESIZE-4K.patch;patch=1 \
- file://500-avr32-atmel.1.3.0.patch;patch=1 \
- file://501-avr32-fix-pool-alignment.patch;patch=1 \
"
+# removed in favor of the atmel 1.2.6 patch which is supposedly newer (yes)
+# file://500-avr32-atmel.1.3.0.patch;patch=1 \
+# file://501-avr32-fix-pool-alignment.patch;patch=1 \
+SRC_URI_append_avr32 = "\
+ file://binutils-2.17.atmel.1.2.6.patch.bz2;patch=1 \
+"
+
# Zecke's OSX fixes
SRC_URI += " file://warning-free.patch;patch=1 "
============================================================
--- packages/gcc/gcc-4.2.2.inc e1a01a5ff03489319241b841ece209ab4fdcbc72
+++ packages/gcc/gcc-4.2.2.inc 6281a032714b397b43955b47208a1dd89efdd74b
@@ -40,6 +40,13 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc
file://intermask-bigendian.patch;patch=1 \
"
+
+SRC_URI_append_avr32 = " \
+ file://gcc-4.2.2.atmel.1.0.8.patch.bz2;patch=1 \
+ file://901-avr32-no-cond-exec-before-reload-by-default.patch;patch=1 \
+"
+
+
SRC_URI_append_ep93xx = " \
file://arm-crunch-saveregs.patch;patch=1 \
file://arm-crunch-20000320.patch;patch=1 \
============================================================
--- packages/gdb/gdb-cross.inc f22b5bdf741d9b9ce7a69086a1b6ff8dc8383420
+++ packages/gdb/gdb-cross.inc 535e8f1b07e8d49315fe81676dc70d61700d6c19
@@ -10,6 +10,12 @@ do_configure () {
# override this function to avoid the autoconf/automake/aclocal/autoheader
# calls for now
(cd ${S} && gnu-configize) || die "failure in running gnu-configize"
+
+ # Fix for issues when system's texinfo version >= 4.10
+ # (See https://bugzilla.redhat.com/show_bug.cgi?id=345621)
+ sed -i -e 's/egrep `texinfo.*`/egrep `texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|4.[1-9][0-9]+|[5-9])`/' '${S}/configure'
+
+
oe_runconf
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080502/be0728c6/attachment.htm
-------------- next part --------------
#
#
# delete "packages/madwifi/madwifi-ng_r1844-20061208.bb"
#
# delete "packages/madwifi/madwifi-ng_r2100-20070210.bb"
#
# delete "packages/madwifi/madwifi-ng_r2156-20070225.bb"
#
# delete "packages/madwifi/madwifi-ng_r2182-20070308.bb"
#
# delete "packages/madwifi/madwifi-ng_r2187-20070309.bb"
#
# delete "packages/madwifi/madwifi-ng_r2518-20070626.bb"
#
# delete "packages/madwifi/madwifi-ng_r2702-20070903.bb"
#
# rename "packages/busybox/busybox-1.9.1"
# to "packages/busybox/busybox-1.9.2"
#
# rename "packages/busybox/busybox_1.9.1.bb"
# to "packages/busybox/busybox_1.9.2.bb"
#
# add_dir "packages/multitap-pad"
#
# add_dir "packages/multitap-pad/files"
#
# add_dir "packages/netbase/netbase/mpc8313e-rdb"
#
# add_file "conf/distro/include/preferred-om-2008-versions.inc"
# content [0741783d8c451adac5e47265611069ee7296c2d7]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/usb-timout.patch"
# content [7acb9cec9859f0c448ef4b56bf2ebd12e8b84c2b]
#
# add_file "packages/multitap-pad/files/80multitappad"
# content [b613cc7c89d800c205b89dd7013c4b3ba309b319]
#
# add_file "packages/multitap-pad/multitap-pad_svn.bb"
# content [8f2b626f58690dd52e509cacab5977c5f52270e2]
#
# add_file "packages/netbase/netbase/mpc8313e-rdb/interfaces"
# content [2ece41786062e70093a58ef17e23d35ea084c316]
#
# patch "MAINTAINERS"
# from [5556c9277c3381070987310400058abdd5f4c820]
# to [df1acfac3b7175de3f71ec85623148d285a64116]
#
# patch "classes/kernel.bbclass"
# from [8d92c5a7b6420490dd6b3115e8146b3fc0a0f854]
# to [8ed575119a74e50c5bcb39266997cba3f60792c2]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [af1d08078aa8f03db44e8b150bc4f043ad26b938]
# to [3f68781354a48bcde95fae1b91ce841a0f88ae0f]
#
# patch "packages/busybox/busybox-1.9.2/defconfig"
# from [f0e872e8e6f3bc9941075571caf38d1a62657458]
# to [b98a8c0c48f931c7b67cd67b5498aac228e47b29]
#
# patch "packages/busybox/busybox_1.9.2.bb"
# from [4ce3286b8b9f17817880e467425ec28de58ea3f4]
# to [a3a8f0f9c2f172464f5e3746ae507d0845fd473f]
#
# patch "packages/freesmartphone/gsm0710muxd_svn.bb"
# from [b214341ba255007649e5d97e71b3d22c2218c73e]
# to [848b41b51ffadb51a05381fbc015bc38fa1fccb1]
#
# patch "packages/freesmartphone/py-odeviced_svn.bb"
# from [6ef92b7c28dc3f0730750da1b7cfeed1cd7da960]
# to [30b9953c30c87828378bdcea8213290cc498ea8f]
#
# patch "packages/linux/linux-omap2-git/beagleboard/defconfig"
# from [ffa35a912f2d6c8016f6ea1d0f7ebb27987a9b28]
# to [6defc6fa96f79492acbfbaed1cc6553abe5edc13]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [e84865c7794f8227ce021537e22050f366fe51b3]
# to [d2df9d873b73d322c1d6a7918ef9c8786b091e48]
#
# patch "packages/madwifi/madwifi-ng_r3314-20080131.bb"
# from [aa87cb14b8005f3b927e4701b1ae845bf2099ec2]
# to [24403394f09cfebacade21edca4dbf1c9fe180ba]
#
# patch "packages/meta/slugos-packages.bb"
# from [46c8ac8a7503c5e222ee23a677a92db2e2ea9dcb]
# to [f62c22f94a5ba8a475afc6d43721c4e29386ca2e]
#
# patch "packages/opkg/opkg_svn.bb"
# from [bc27245782ad8e3348db57c3d14c9e75b4f1b404]
# to [e034851c3a5985b17cbde739bc5bb59a8c69d323]
#
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc 0741783d8c451adac5e47265611069ee7296c2d7
+++ conf/distro/include/preferred-om-2008-versions.inc 0741783d8c451adac5e47265611069ee7296c2d7
@@ -0,0 +1,15 @@
+PREFERRED_VERSION_asterisk = "1.4.17"
+PREFERRED_VERSION_busybox = "1.9.1"
+PREFERRED_VERSION_dbus = "1.2.1"
+PREFERRED_VERSION_dbus-glib = "0.74"
+PREFERRED_VERSION_glib-2.0 = "2.16.1"
+PREFERRED_VERSION_gnash = "0.8.2"
+PREFERRED_VERSION_gpsdrive = "2.10pre4"
+PREFERRED_VERSION_gst-pulse = "0.9.7"
+PREFERRED_VERSION_intltool = "0.35.5"
+PREFERRED_VERSION_intltool-native = "0.35.5"
+PREFERRED_VERSION_libtool = "1.5.24"
+PREFERRED_VERSION_midori = "0.0.17"
+PREFERRED_VERSION_pulseaudio = "0.9.9"
+PREFERRED_VERSION_udev = "118"
+PREFERRED_VERSION_vte = "0.16.9"
============================================================
--- packages/linux/linux-omap2-git/beagleboard/usb-timout.patch 7acb9cec9859f0c448ef4b56bf2ebd12e8b84c2b
+++ packages/linux/linux-omap2-git/beagleboard/usb-timout.patch 7acb9cec9859f0c448ef4b56bf2ebd12e8b84c2b
@@ -0,0 +1,11 @@
+--- /tmp/ehci-hub.c 2008-04-30 11:41:59.381876290 +0200
++++ git/drivers/usb/host/ehci-hub.c 2008-04-30 11:42:20.522875367 +0200
+@@ -734,7 +734,7 @@
+ * this bit; seems too long to spin routinely...
+ */
+ retval = handshake(ehci, status_reg,
+- PORT_RESET, 0, 750);
++ PORT_RESET, 0, 1250);
+ if (retval != 0) {
+ ehci_err (ehci, "port %d reset error %d\n",
+ wIndex + 1, retval);
============================================================
--- packages/multitap-pad/files/80multitappad b613cc7c89d800c205b89dd7013c4b3ba309b319
+++ packages/multitap-pad/files/80multitappad b613cc7c89d800c205b89dd7013c4b3ba309b319
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+CMD=""
+
+if [ "$DISPLAY_CAN_ROTATE" = "1" ]; then
+ if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then
+ CMD="multitap-pad -d -o landscape"
+ elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then
+ CMD="multitap-pad -d -o portrait"
+ fi
+else
+ CMD="multitap-pad -d"
+fi
+
+
+# Delay to make sure the window manager is active
+
+if [ "$CMD" ]; then
+ (sleep 2 && $CMD) &
+fi
============================================================
--- packages/multitap-pad/multitap-pad_svn.bb 8f2b626f58690dd52e509cacab5977c5f52270e2
+++ packages/multitap-pad/multitap-pad_svn.bb 8f2b626f58690dd52e509cacab5977c5f52270e2
@@ -0,0 +1,47 @@
+DESCRIPTION = "Multi-tap input method for GTK"
+LICENSE = "GPL"
+DEPENDS = "libfakekey gtk+ matchbox-panel-2"
+RCONFLICTS = matchbox-keyboard-inputmethod
+SECTION = "x11"
+PV = "0.0+svnr${SRCREV}"
+
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http \
+ file://80multitappad"
+
+inherit autotools pkgconfig
+
+S = "${WORKDIR}/${PN}"
+
+FILES_${PN} = "${bindir}/* \
+ ${libdir} \
+ ${sysconfdir} \
+ ${datadir}"
+
+FILES_${PN}-dbg += " ${libdir}/gtk-2.0/2.10.0/immodules/.debug \
+ ${libdir}/matchbox-panel/.debug"
+
+FILES_${PN}-dev += " ${libdir}/gtk-2.0/2.10.0/immodules/*.a \
+ ${libdir}/gtk-2.0/2.10.0/immodules/*.la \
+ ${libdir}/matchbox-panel/*.a \
+ ${libdir}/matchbox-panel/*.la"
+
+do_install_append () {
+ install -d ${D}/${sysconfdir}/X11/Xsession.d/
+ install -m 755 ${WORKDIR}/80multitappad ${D}/${sysconfdir}/X11/Xsession.d/
+}
+
+pkg_postinst_multitap-pad () {
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+
+gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
+
+pkg_postrm_multitap-pad () {
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+
+gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
============================================================
--- packages/netbase/netbase/mpc8313e-rdb/interfaces 2ece41786062e70093a58ef17e23d35ea084c316
+++ packages/netbase/netbase/mpc8313e-rdb/interfaces 2ece41786062e70093a58ef17e23d35ea084c316
@@ -0,0 +1,16 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+# Wired interface
+auto eth1
+iface eth1 inet dhcp
+
+# Wireless interface
+auto ath0
+iface ath0 inet static
+ address 192.168.99.1
+ netmask 255.255.255.0
+
============================================================
--- MAINTAINERS 5556c9277c3381070987310400058abdd5f4c820
+++ MAINTAINERS df1acfac3b7175de3f71ec85623148d285a64116
@@ -97,7 +97,8 @@ Recipes: libexosip2, python-cheetah,
Website: http://www.jerryweb.org/
Machines: mpc8313e-rdb
Recipes: libexosip2, python-cheetah, python-django, python-pyopenssl,
-Recipes: pump, squid, squidview
+Recipes: pump, squid, squidview, hostap-daemon, wpa-supplicant, linux,
+Recipes: u-boot
Person: Joaquim Duran
Mail: joaquinduran at adtelecom.es
============================================================
--- classes/kernel.bbclass 8d92c5a7b6420490dd6b3115e8146b3fc0a0f854
+++ classes/kernel.bbclass 8ed575119a74e50c5bcb39266997cba3f60792c2
@@ -471,7 +471,7 @@ do_deploy() {
install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
- if [ -d "${D}lib" ]; then
+ if [ -d "${D}/lib" ]; then
tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}.tgz -C ${D} lib
fi
============================================================
--- conf/distro/include/sane-srcrevs.inc af1d08078aa8f03db44e8b150bc4f043ad26b938
+++ conf/distro/include/sane-srcrevs.inc 3f68781354a48bcde95fae1b91ce841a0f88ae0f
@@ -37,7 +37,7 @@ SRCREV_pn-gpe-contacts ?= "9312"
SRCREV_pn-gconf-dbus ?= "641"
SRCREV_pn-gnuradio ?= "6377"
SRCREV_pn-gpe-contacts ?= "9312"
-SRCREV_pn-gsm0710muxd ?= "263"
+SRCREV_pn-gsm0710muxd ?= "287"
SRCREV_pn-gtkhtml2 ?= "1158"
SRCREV_pn-gypsy ?= "134"
SRCREV_pn-hildon-1 ?= "14429"
@@ -152,7 +152,7 @@ SRCREV_pn-psplash ?= "249"
SRCREV_pn-oprofileui ?= "160"
SRCREV_pn-packagekit ?= "432046796fa420f57ab6c71081f7ba14e9a92574"
SRCREV_pn-psplash ?= "249"
-SRCREV_pn-py-odeviced ?= "190"
+SRCREV_pn-py-odeviced ?= "283"
SRCREV_pn-pylgrim ?= "20"
SRCREV_pn-pyneod ?= "88"
SRCREV_pn-pyneog ?= "88"
============================================================
--- packages/busybox/busybox-1.9.2/defconfig f0e872e8e6f3bc9941075571caf38d1a62657458
+++ packages/busybox/busybox-1.9.2/defconfig b98a8c0c48f931c7b67cd67b5498aac228e47b29
@@ -619,8 +619,8 @@ CONFIG_NC=y
# CONFIG_NAMEIF is not set
# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
CONFIG_NC=y
-# CONFIG_NC_SERVER is not set
-# CONFIG_NC_EXTRA is not set
+CONFIG_NC_SERVER=y
+CONFIG_NC_EXTRA=y
CONFIG_NETSTAT=y
# CONFIG_FEATURE_NETSTAT_WIDE is not set
CONFIG_NSLOOKUP=y
============================================================
--- packages/busybox/busybox_1.9.1.bb 4ce3286b8b9f17817880e467425ec28de58ea3f4
+++ packages/busybox/busybox_1.9.2.bb a3a8f0f9c2f172464f5e3746ae507d0845fd473f
@@ -1,8 +1,7 @@ require busybox.inc
require busybox.inc
-PR = "r4"
+PR = "r0"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
- http://busybox.net/downloads/fixes-1.9.1/busybox-1.9.1-lineedit.patch;patch=1 \
file://udhcpscript.patch;patch=1 \
file://adduser-longops.patch;patch=1 \
file://sort-z-nul.patch;patch=1;status=upstream \
============================================================
--- packages/freesmartphone/gsm0710muxd_svn.bb b214341ba255007649e5d97e71b3d22c2218c73e
+++ packages/freesmartphone/gsm0710muxd_svn.bb 848b41b51ffadb51a05381fbc015bc38fa1fccb1
@@ -2,32 +2,22 @@ SECTION = "console/network"
HOMEPAGE = "http://www.freesmartphone.org"
AUTHOR = "M. Dietrich"
SECTION = "console/network"
-DEPENDS = "intltool-native dbus dbus-glib"
+DEPENDS = "dbus dbus-glib"
RDEPENDS = "dbus dbus-glib"
LICENSE = "GPL"
-PV = "0.9.0+svnr${SRCREV}"
-PR = "r0"
+PV = "0.9.1+svnr${SRCREV}"
+PR = "r1"
SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=gsm0710muxd"
S = "${WORKDIR}/gsm0710muxd"
inherit autotools
+# install init script for people who want to manually
+# start/stop it, but don't add runlevels.
do_install_append() {
- # temp hack
- mv -f ${D}${datadir}/dbus-1/system-services/org.freesmartphone.GSM.MUX.service ${D}${datadir}/dbus-1/system-services/org.mobile.mux.service
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 data/gsm0710muxd ${D}${sysconfdir}/init.d/
}
+FILES_${PN} += "${datadir} ${sysconfdir}"
-pkg_postinst_${PN}() {
- # can't do this offline
- if [ "x$D" != "x" ]; then
- exit 1
- fi
- # reload dbus configuration files
- for i in `pidof dbus-daemon`; do
- kill -SIGHUP $i
- done
-}
-
-FILES_${PN} += "${datadir}"
-
============================================================
--- packages/freesmartphone/py-odeviced_svn.bb 6ef92b7c28dc3f0730750da1b7cfeed1cd7da960
+++ packages/freesmartphone/py-odeviced_svn.bb 30b9953c30c87828378bdcea8213290cc498ea8f
@@ -21,11 +21,15 @@ do_install_append() {
install -d ${D}${sysconfdir}/init.d/
install -m 0755 ${WORKDIR}/odeviced ${D}${sysconfdir}/init.d/
install -m 0644 ${WORKDIR}/odeviced.conf ${D}${sysconfdir}
+ install -d ${D}${sysconfdir}/dbus-1/system.d/
+ mv -f ${D}${datadir}/etc/dbus-1/system.d/odeviced.conf ${D}${sysconfdir}/dbus-1/system.d/
}
RDEPENDS_${PN} += "\
python-dbus \
python-pygobject \
+ python-pyrtc \
+ python-syslog \
"
FILES_${PN} += "${sysconfdir}"
============================================================
--- packages/linux/linux-omap2-git/beagleboard/defconfig ffa35a912f2d6c8016f6ea1d0f7ebb27987a9b28
+++ packages/linux/linux-omap2-git/beagleboard/defconfig 6defc6fa96f79492acbfbaed1cc6553abe5edc13
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.25-omap1
-# Thu Apr 24 21:02:00 2008
+# Wed Apr 30 11:44:55 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -941,9 +941,10 @@ CONFIG_VIDEO_V4L2_COMMON=y
#
CONFIG_VIDEO_DEV=y
CONFIG_VIDEO_V4L2_COMMON=y
-# CONFIG_VIDEO_V4L1 is not set
+CONFIG_VIDEO_ALLOW_V4L1=y
CONFIG_VIDEO_V4L1_COMPAT=y
CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L1=y
CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
@@ -973,11 +974,21 @@ CONFIG_VIDEO_WM8775=m
#
# Video decoders
#
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
# CONFIG_VIDEO_OV7670 is not set
# CONFIG_VIDEO_TCM825X is not set
# CONFIG_VIDEO_OV9640 is not set
+# CONFIG_VIDEO_SAA7110 is not set
+# CONFIG_VIDEO_SAA7111 is not set
+# CONFIG_VIDEO_SAA7114 is not set
CONFIG_VIDEO_SAA711X=m
+# CONFIG_VIDEO_SAA717X is not set
+# CONFIG_VIDEO_SAA7191 is not set
# CONFIG_VIDEO_TVP5150 is not set
+# CONFIG_VIDEO_VPX3220 is not set
#
# Video and audio decoders
@@ -993,6 +1004,9 @@ CONFIG_VIDEO_CX2341X=m
# Video encoders
#
# CONFIG_VIDEO_SAA7127 is not set
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
#
# Video improvement chips
@@ -1000,22 +1014,39 @@ CONFIG_VIDEO_VIVI=m
# CONFIG_VIDEO_UPD64031A is not set
# CONFIG_VIDEO_UPD64083 is not set
CONFIG_VIDEO_VIVI=m
+# CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_CPIA2 is not set
CONFIG_VIDEO_SAA5246A=m
CONFIG_VIDEO_SAA5249=m
+# CONFIG_TUNER_3036 is not set
+# CONFIG_VIDEO_AU0828 is not set
CONFIG_V4L_USB_DRIVERS=y
CONFIG_VIDEO_PVRUSB2=m
CONFIG_VIDEO_PVRUSB2_ONAIR_CREATOR=y
CONFIG_VIDEO_PVRUSB2_ONAIR_USB2=y
CONFIG_VIDEO_PVRUSB2_SYSFS=y
+# CONFIG_VIDEO_PVRUSB2_DVB is not set
# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
CONFIG_VIDEO_EM28XX=m
CONFIG_VIDEO_EM28XX_ALSA=m
+# CONFIG_VIDEO_EM28XX_DVB is not set
CONFIG_VIDEO_USBVISION=m
+# CONFIG_USB_VICAM is not set
+# CONFIG_USB_IBMCAM is not set
+# CONFIG_USB_KONICAWC is not set
+# CONFIG_USB_QUICKCAM_MESSENGER is not set
CONFIG_USB_ET61X251=m
+# CONFIG_VIDEO_OVCAMCHIP is not set
+# CONFIG_USB_W9968CF is not set
+# CONFIG_USB_OV511 is not set
+# CONFIG_USB_SE401 is not set
CONFIG_USB_SN9C102=m
+# CONFIG_USB_STV680 is not set
CONFIG_USB_ZC0301=m
+# CONFIG_USB_PWC is not set
CONFIG_USB_ZR364XX=m
CONFIG_USB_STKWEBCAM=m
+# CONFIG_SOC_CAMERA is not set
# CONFIG_RADIO_ADAPTERS is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_CORE_ATTACH=y
@@ -1094,6 +1125,7 @@ CONFIG_DVB_DIB7000P=m
CONFIG_DVB_DIB3000MC=m
CONFIG_DVB_DIB7000M=m
CONFIG_DVB_DIB7000P=m
+# CONFIG_DVB_TDA10048 is not set
#
# DVB-C (cable) frontends
@@ -1112,6 +1144,7 @@ CONFIG_DVB_S5H1409=m
CONFIG_DVB_BCM3510=m
CONFIG_DVB_LGDT330X=m
CONFIG_DVB_S5H1409=m
+# CONFIG_DVB_AU8522 is not set
#
# Tuners/PLL support
@@ -1126,11 +1159,13 @@ CONFIG_DVB_TUNER_XC5000=m
CONFIG_DVB_TUNER_MT2131=m
CONFIG_DVB_TUNER_DIB0070=m
CONFIG_DVB_TUNER_XC5000=m
+# CONFIG_DVB_TUNER_ITD1000 is not set
#
# Miscellaneous devices
#
CONFIG_DVB_LNBP21=m
+# CONFIG_DVB_ISL6405 is not set
CONFIG_DVB_ISL6421=m
CONFIG_DVB_TUA6100=m
CONFIG_VIDEO_TUNER=m
@@ -1263,10 +1298,6 @@ CONFIG_SND_SOC=y
CONFIG_SND_SOC=y
#
-# SoC Audio support for SuperH
-#
-
-#
# ALSA SoC audio for Freescale SOCs
#
@@ -1312,7 +1343,7 @@ CONFIG_USB_SUSPEND=y
#
# USB Host Controller Drivers
#
-CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_HCD=m
CONFIG_OMAP_EHCI_PHY_MODE=y
# CONFIG_OMAP_EHCI_TLL_MODE is not set
CONFIG_USB_EHCI_ROOT_HUB_TT=y
@@ -1434,7 +1465,7 @@ CONFIG_USB_LED=m
# CONFIG_USB_IDMOUSE is not set
# CONFIG_USB_FTDI_ELAN is not set
# CONFIG_USB_APPLEDISPLAY is not set
-CONFIG_USB_SISUSBVGA=y
+CONFIG_USB_SISUSBVGA=m
CONFIG_USB_SISUSBVGA_CON=y
# CONFIG_USB_LD is not set
# CONFIG_USB_TRANCEVIBRATOR is not set
@@ -1638,7 +1669,6 @@ CONFIG_NFS_V4=y
CONFIG_NFS_V3=y
# CONFIG_NFS_V3_ACL is not set
CONFIG_NFS_V4=y
-# CONFIG_NFS_DIRECTIO is not set
# CONFIG_NFSD is not set
CONFIG_ROOT_NFS=y
CONFIG_LOCKD=y
============================================================
--- packages/linux/linux-omap2_git.bb e84865c7794f8227ce021537e22050f366fe51b3
+++ packages/linux/linux-omap2_git.bb d2df9d873b73d322c1d6a7918ef9c8786b091e48
@@ -2,16 +2,17 @@ FILESDIR = "${@os.path.dirname(bb.data.g
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}"
-SRCREV = "4bb9f8b58ed7d14d276750d1792cef9b3aa1e9ec"
+SRCREV = "59586cd959b31f91f29cf96c1d3f8ff52c3c0607"
PV = "2.6.25+git${SRCREV}"
-PR = "r5"
+PR = "r6"
SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
- file://defconfig"
+ file://defconfig"
SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
+ file://usb-timout.patch;patch=1 \
"
COMPATIBLE_MACHINE = "omap2430sdp|omap2420h4|beagleboard"
============================================================
--- packages/madwifi/madwifi-ng_r3314-20080131.bb aa87cb14b8005f3b927e4701b1ae845bf2099ec2
+++ packages/madwifi/madwifi-ng_r3314-20080131.bb 24403394f09cfebacade21edca4dbf1c9fe180ba
@@ -1,8 +1,5 @@
# Bitbake recipe for the madwifi-ng driver
-DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_ixp4xx = "1"
-
# Disable stripping of kernel modules, since this action strips too
# much out, and the resulting module won't load.
INHIBIT_PACKAGE_STRIP = "1"
============================================================
--- packages/meta/slugos-packages.bb 46c8ac8a7503c5e222ee23a677a92db2e2ea9dcb
+++ packages/meta/slugos-packages.bb f62c22f94a5ba8a475afc6d43721c4e29386ca2e
@@ -5,7 +5,7 @@ LICENSE = "MIT"
DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r51"
+PR = "r53"
CONFLICTS = "db3"
COMPATIBLE_MACHINE = "nslu2|ixp4xx"
@@ -50,6 +50,7 @@ SLUGOS_PACKAGES = "\
bluez-utils \
bluez-hcidump \
bogofilter \
+ bonnie++ \
boost \
bridge-utils \
bzip2 \
@@ -103,6 +104,7 @@ SLUGOS_PACKAGES = "\
hdparm \
ifupdown \
inetutils \
+ iozone3 \
iperf \
ipkg-utils \
iptables \
============================================================
--- packages/opkg/opkg_svn.bb bc27245782ad8e3348db57c3d14c9e75b4f1b404
+++ packages/opkg/opkg_svn.bb e034851c3a5985b17cbde739bc5bb59a8c69d323
@@ -1,6 +1,6 @@ require opkg.inc
require opkg.inc
-PR = "r3"
+PR = "r4"
PACKAGES =+ "libopkg-dev libopkg"
@@ -12,7 +12,7 @@ OPKG_INIT_POSITION_slugos = "41"
OPKG_INIT_POSITION = "98"
OPKG_INIT_POSITION_slugos = "41"
-pkg_postinst_opkg () {
+pkg_postinst_${PN} () {
#!/bin/sh
if [ "x$D" != "x" ]; then
install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
@@ -26,7 +26,7 @@ update-alternatives --install ${bindir}/
update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100
}
-pkg_postrm_opkg () {
+pkg_postrm_${PN} () {
#!/bin/sh
update-alternatives --remove opkg ${bindir}/opkg-cl
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080502/be0728c6/attachment-0001.htm
More information about the commitlog
mailing list