diff options
39 files changed, 617 insertions, 155 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2447434e85..5086136aa3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -163,6 +163,13 @@ Website: http://marcin.juszkiewicz.com.pl/ Machines: progear, alix, at91sam9263ek Distros: Poky, Ångström +Person: Marco Cavallini +Mail: m.cavallini@koansoftware.com +Website: http://www.koansoftware.com - http://www.embedded.it +Machines: ronetix-pm9263, vortex86sx, at91sam9g20ek +Distros: KaeilOS, Ångström +Interests: x86, ARM, wxWidgets + Person: Matthias 'CoreDump' Hentges Website: http://www.hentges.net Distros: Sonkei diff --git a/classes/patch.bbclass b/classes/patch.bbclass index 075e826523..8d2bde0c4f 100644 --- a/classes/patch.bbclass +++ b/classes/patch.bbclass @@ -13,14 +13,22 @@ def patch_init(d): return "Error: %s not found." % self.path def md5sum(fname): - import md5, sys + import sys + + # when we move to Python 2.5 as minimal supported + # we can kill that try/except as hashlib is 2.5+ + try: + import hashlib + m = hashlib.md5() + except ImportError: + import md5 + m = md5.new() try: f = file(fname, 'rb') except IOError: raise NotFoundError(fname) - m = md5.new() while True: d = f.read(8096) if not d: diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index 82a1616d05..0221b123f1 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -49,6 +49,7 @@ def get_siteinfo_list(d): "i486-mingw32": "endian-little bit-32 common-mingw ix86-common",\ "i586-mingw32": "endian-little bit-32 common-mingw ix86-common",\ "i686-mingw32": "endian-little bit-32 common-mingw ix86-common",\ + "ia64-linux": "endian-little bit-64 common-linux common-glibc",\ "mipsel-linux": "endian-little bit-32 common-linux common-glibc",\ "mipsel-linux-uclibc": "endian-little bit-32 common-linux common-uclibc",\ "mips-linux": "endian-big bit-32 common-linux common-glibc",\ diff --git a/conf/checksums.ini b/conf/checksums.ini index 286c184d25..b06153b0ee 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -3734,6 +3734,10 @@ sha256=d391829686eb002ace3ffbfed75c35e877b42c1884c9359791634b5b57126797 md5=d8f3bbfbcc337d9776991d9561f451f3 sha256=773ce12045ce98c3be4b1845547435f1b7798996fa3170dea72c7c15aa5ca79d +[http://install.tarball.in.source.dir/codec_engine_2_23_01.tar.gz] +md5=581f548714a53d818ac355a1e4aacfa4 +sha256=32c96ec23642d827bcbc865ac490fe7f2eeec2e04448980c4eb70d0fb25f74d8 + [http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/collie-kexec-r1.patch] md5=ed96c1bddce4b7e40a40bad1d3cd63b5 sha256=c178b3a7460cfaeb58c11ef9641d72ee912818b2ecbf1c09edf628d9168c0971 @@ -3898,6 +3902,10 @@ sha256=79e7d8948e11b94ced41f030c495706baca4bd9dafdfe730cf537fd0907ed3ef md5=c7d5cbcdaaf98f194c2a59b26436ce34 sha256=73f3b92c0f85ab2bf0f9bb18f928a8b84cacdbb459f3a530df540d4ddf134405 +[http://www.kernel.org/pub/linux/network/connman/connman-0.16.tar.gz] +md5=7bc5c89870d47c88f407fcfd666c739d +sha256=102bb7a5d329dd6831bc8a923fa0b5d7634efa215e3d15377630d9b738df49da + [ftp://ftp.moblin.org/connman/releases/connman-0.2.tar.gz] md5=bf48aa07d3c1e5fe272c7f139bc01fc9 sha256=eacc3c57cffb411b09d834d2225323cde5676165b5d2fc2a27b16cde98e3ba97 @@ -6042,6 +6050,10 @@ sha256=5382518ad10313c4c22fbfd2bf5cbf1a6e88160e7e29ab5dcd07362147d04c8d md5=c315e06cdfe9ee76aa4831ece1ed5df3 sha256=402ca3641f1724f5a4ec1ac3e283cd1334bd85c4b5de7744bd267454ef31259e +[http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/3.5b4-candidates/build1/source/firefox-3.5b4-source.tar.bz2] +md5=ff6bf463300cb56bcf750973b2af3d80 +sha256=b653f2fa8dfdd0a54a6b8c576769719cf9014ca6b09f8e9d351721a51766d95d + [http://handhelds.org/~zecke/oe_packages/fish_V1.1.0.tar.gz] md5=78770f1abce09fbbaa0a46ce8ccc607f sha256=9d13db38c065d70f48ce70580c7d8cd940d923192c04bc3cb356cc98879b5788 @@ -18362,13 +18374,9 @@ sha256=e5ad0ec9b0facaab5982a0d48534292e6d3a6a3e6dca60e798e8b8eeda2f8a8e md5=26f67d99666834cc579094619821d3c8 sha256=035bbd4c1ac9c5b3a42e58777446e0370ca66d9258dc30a9f4c5ad48ebfacd65 -[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc1.bz2] -md5=05daeda25430fd13bbdb47b3481f7320 -sha256=5ed217591fefb043f4deb7b66a9b6351195dfb9405c0d2f5ec0f4d43a30aa9b2 - -[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc3.bz2] -md5=cd69d16ea42bbf20d0a505690be45868 -sha256=7d07783e7ba793c8e043a83a2aabcf23ef29174a1963643a407f3a02fcb4542b +[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc5.bz2] +md5=2f399a5e286a9fe7cb40bfd3d42a7a3d +sha256=79a9913a74e58af6431bb952aac2cf0a1f4422287f420844f24ca6bc5ed0fdc4 [http://www.muru.com/linux/omap/patches/patch-2.6.9-omap1.bz2] md5=d6249654087f0bcafaa860ac573316a4 diff --git a/conf/distro/include/eglibc.inc b/conf/distro/include/eglibc.inc index ed3e0ecf9d..0d2087ed4b 100644 --- a/conf/distro/include/eglibc.inc +++ b/conf/distro/include/eglibc.inc @@ -1,5 +1,5 @@ # Add glibc overrides to the overrides for eglibc. -OVERRIDES .= ":glibc" +OVERRIDES .= ":libc-glibc" # The things eglibc can provide. We default to wanting eglibc to provide them. PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" diff --git a/conf/distro/include/glibc.inc b/conf/distro/include/glibc.inc index 1d6b22d8b5..f9140ffa43 100644 --- a/conf/distro/include/glibc.inc +++ b/conf/distro/include/glibc.inc @@ -1,5 +1,5 @@ # Add glibc to the overrides. -OVERRIDES .= ":glibc" +OVERRIDES .= ":libc-glibc" # The things glibc can provide. We default to wanting glibc to provide them. PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" diff --git a/conf/distro/include/uclibc.inc b/conf/distro/include/uclibc.inc index 979b7f1539..ee18fc87e1 100644 --- a/conf/distro/include/uclibc.inc +++ b/conf/distro/include/uclibc.inc @@ -1,5 +1,5 @@ # Add uclibc overrides to the overrides. -OVERRIDES .= ":uclibc" +OVERRIDES .= ":libc-uclibc" # The things uclibc can provide. We default to wanting uclibc to provide them. PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 022d65d4c2..a00fec4c2a 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -102,7 +102,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # generated to the list provided by GLIBC_GENERATE_LOCALES. This is huge # time-savior for developmental builds. Format: list of locale.encoding pairs # with spaces as separators. -# GLIBC_GENERATE_LOCALES = "en_GB.UTF-8 de_DE.UTF-8" +# GLIBC_GENERATE_LOCALES = "en_US.UTF-8 en_GB.UTF-8 de_DE.UTF-8" # Uncomment this to select a particular major kernel version if the MACHINE setting # supports more than one major kernel version. Currently this is suported by the @@ -147,6 +147,12 @@ IMAGE_FSTYPES = "jffs2 tar" # in the process of marking these so let us know if you find any. # PARALLEL_MAKE = "-j 4" +# Uncomment to run multiple bitbake threads in parallel. +# Bitbake can do multiple jobs in parallel: Its a good idea make use of +# all available resources: e.g. to download sources while some other +# piece of software is compiled. +# BB_NUMBER_THREADS = "2" + # Uncomment this if you want BitBake to emit the log if a build fails. BBINCLUDELOGS = "yes" diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 2e33e33606..9f48f750e7 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -1,7 +1,7 @@ require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r32" +MACHINE_KERNEL_PR = "r33" KERNEL_IMAGETYPE = "uImage" diff --git a/conf/machine/micro2440.conf b/conf/machine/micro2440.conf index 5c8da70e68..20e14af78f 100644 --- a/conf/machine/micro2440.conf +++ b/conf/machine/micro2440.conf @@ -5,6 +5,7 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_VERSION_linux = "2.6.29" # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttySAC0" diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf index a74746824d..a74746824d 100755..100644 --- a/conf/machine/netbook-pro.conf +++ b/conf/machine/netbook-pro.conf diff --git a/conf/machine/topas910.conf b/conf/machine/topas910.conf index 3b29929eaa..e4b9aead8a 100644 --- a/conf/machine/topas910.conf +++ b/conf/machine/topas910.conf @@ -30,12 +30,11 @@ ROOT_FLASH_SIZE = "256" # extra jffs2 tweaks IMAGE_FSTYPES ?= "jffs2" -EXTRA_IMAGECMD_jffs2 = "--little-endian --pad=0x1DC0000 --eraseblock=0x20000 -n" -#EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 \ -# --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" +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 \ + --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 += "lowlevel-topas910" diff --git a/recipes/connman/connman_0.16.bb b/recipes/connman/connman_0.16.bb new file mode 100644 index 0000000000..b8d86613b8 --- /dev/null +++ b/recipes/connman/connman_0.16.bb @@ -0,0 +1,35 @@ +require connman.inc + +EXTRA_OECONF += "\ + --disable-gtk-doc \ + --enable-debug \ + --enable-threads \ + --enable-loopback \ + --enable-ethernet \ + --enable-wifi \ + --disable-wimax \ + --enable-bluetooth \ + --enable-udhcp \ + --enable-dhclient \ + --enable-resolvconf \ + --enable-dnsproxy \ + --disable-novatel \ + --disable-huawei \ + --disable-hso \ + --enable-ppp \ +# needs udev >= 129 + --disable-udev \ + --disable-polkit \ + --enable-client \ + --enable-fake \ +# --with-udhcpc=PROGRAM \ +# --with-dhclient=PROGRAM \ +# --with-resolvconf=PROGRAM \ +# --with-pppd=PROGRAM \ +" + +SRC_URI = "\ + http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \ + file://connman \ +" + diff --git a/recipes/dsplink/ti-codec-engine_2.23.bb b/recipes/dsplink/ti-codec-engine_2.23.bb index 842dfa0846..2c4038d67f 100644 --- a/recipes/dsplink/ti-codec-engine_2.23.bb +++ b/recipes/dsplink/ti-codec-engine_2.23.bb @@ -9,23 +9,20 @@ INSANE_SKIP_${PN} = True inherit module -# disable this package for now, while we're in test mode -DEFAULT_PREFERENCE = "-1" - # tconf from xdctools dislikes '.' in pwd :/ PV = "223" # Get CE tarball from TI website, place in sources and calculate md5sum # Look for tarball at https://www-a.ti.com/downloads/sds_support/targetcontent/CE/index.html -SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_23.tar.gz \ +SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_23_01.tar.gz \ file://loadmodules-ti-dsplink-apps.sh \ file://unloadmodules-ti-dsplink-apps.sh \ file://loadmodules-ti-codec-engine-apps.sh \ file://unloadmodules-ti-codec-engine-apps.sh \ " -S = "${WORKDIR}/codec_engine_2_23" +S = "${WORKDIR}/codec_engine_2_23_01" ########### @@ -167,7 +164,7 @@ do_compile () { DSPLINK_REPO="${DSPLINK}/.." \ LINUXKERNEL_INSTALL_DIR="${STAGING_KERNEL_DIR}" \ MVTOOL_PREFIX="${TARGET_PREFIX}" \ - .clean default + clean default # CMEM - Build the cmem kernel module and associated test apps # TODO - Still need to clean up UCTOOLs - don't really want to build UC here - it's not good to just build with MVTOOLS (GLIBC) diff --git a/recipes/gcc/gcc-4.2.4.inc b/recipes/gcc/gcc-4.2.4.inc index 6bffa54265..80d38f91cf 100644 --- a/recipes/gcc/gcc-4.2.4.inc +++ b/recipes/gcc/gcc-4.2.4.inc @@ -3,6 +3,8 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" +INC_PR = "r6" + SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://100-uclibc-conf.patch;patch=1 \ file://103-uclibc-conf-noupstream.patch;patch=1 \ diff --git a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb index 8859a47331..409970be5f 100644 --- a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb +++ b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb @@ -1,6 +1,6 @@ inherit canadian-sdk -PR = "r3" +PR = "${INC_PR}.1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" @@ -12,7 +12,7 @@ require gcc-${PV}.inc DEPENDS = "gmp-canadian mpfr-canadian" require gcc-configure-canadian-sdk.inc -require gcc-package-canadian-sdk.inc +require gcc-package-sdk.inc SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1 \ file://pr22133-mingw-path-fixup.patch;patch=1 \ diff --git a/recipes/gcc/gcc-cross-sdk_4.2.4.bb b/recipes/gcc/gcc-cross-sdk_4.2.4.bb index 0a3af9e469..c5a0a1aa88 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.4.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.4.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "${INC_PR}.1" inherit sdk diff --git a/recipes/gcc/gcc-cross_4.2.4.bb b/recipes/gcc/gcc-cross_4.2.4.bb index 11e04594fc..4e7fc479d1 100644 --- a/recipes/gcc/gcc-cross_4.2.4.bb +++ b/recipes/gcc/gcc-cross_4.2.4.bb @@ -1,4 +1,4 @@ -PR = "r6" +PR = "${INC_PR}.1" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-package-canadian-sdk.inc b/recipes/gcc/gcc-package-canadian-sdk.inc deleted file mode 100644 index dff53cdd96..0000000000 --- a/recipes/gcc/gcc-package-canadian-sdk.inc +++ /dev/null @@ -1,39 +0,0 @@ -require gcc-package-sdk.inc - -PACKAGES += "libgcc libgcc-dev libgfortran-dev libmudflap libmudflap-dev" - -FILES_libgcc = "${libdir}/libgcc*.so.*" -FILES_libgcc-dev = "${libdir}/libgcc*.so" - -FILES_libstdc++ = "${libdir}/libstdc++.so.*" -FILES_libstdc++-dev = "\ - ${incluedir}/c++/${BINV} \ - ${libdir}/libstdc++.so \ - ${libdir}/libstdc++.la \ - ${libdir}/libstdc++.a \ - ${libdir}/libsupc++.la \ - ${libdir}/libsupc++.a \ -" - -FILES_libgfortran-dev = "${libdir}/libgfortran.a \ - ${libdir}/libgfortran.so \ - ${libdir}/libgfortranbegin.a" - -FILES_libmudflap = "${libdir}/libmudflap*.so.*" -FILES_libmudflap-dev = "\ - ${libdir}/libmudflap*.so \ - ${libdir}/libmudflap*.a \ - ${libdir}/libmudflap*.a \ -" - -# Packages emitted by our gcc-cross builds. -# -INHIBIT_PACKAGE_STRIP ?= "" -OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}" -INHIBIT_PACKAGE_STRIP = "1" - -python do_package() { - if bb.data.getVar('DEBIAN_NAMES', d, 1): - bb.data.setVar('PKG_libgcc', 'libgcc1', d) - bb.build.exec_func('package_do_package', d) -} diff --git a/recipes/gcc/gcc_4.2.4.bb b/recipes/gcc/gcc_4.2.4.bb index 318ccd3775..6b20b47f1a 100644 --- a/recipes/gcc/gcc_4.2.4.bb +++ b/recipes/gcc/gcc_4.2.4.bb @@ -1,4 +1,4 @@ -PR = "r4" +PR = "${INC_PR}.1" require gcc-${PV}.inc require gcc-configure-target.inc diff --git a/recipes/glibc/glibc_2.7.bb b/recipes/glibc/glibc_2.7.bb index ec4b347713..8ae84c1c7e 100644 --- a/recipes/glibc/glibc_2.7.bb +++ b/recipes/glibc/glibc_2.7.bb @@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm" PACKAGES_DYNAMIC = "libc6*" RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" -PR = "r9" +PR = "r10" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" @@ -67,6 +67,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ file://generic-bits_time.h \ file://etc/ld.so.conf \ file://generate-supported.mk \ + file://march-i686.patch;patch=1;pnum=0 \ " diff --git a/recipes/glibc/glibc_2.9.bb b/recipes/glibc/glibc_2.9.bb index 0af9f263d5..7859876cb0 100644 --- a/recipes/glibc/glibc_2.9.bb +++ b/recipes/glibc/glibc_2.9.bb @@ -5,6 +5,8 @@ ARM_INSTRUCTION_SET = "arm" PACKAGES_DYNAMIC = "libc6*" RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" +PR = "r1" + # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" @@ -58,6 +60,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ file://generic-bits_time.h \ file://etc/ld.so.conf \ file://generate-supported.mk \ + file://march-i686.patch;patch=1;pnum=0 \ " diff --git a/recipes/gpe-mixer/gpe-mixer_0.50.bb b/recipes/gpe-mixer/gpe-mixer_0.50.bb new file mode 100644 index 0000000000..a025be21d6 --- /dev/null +++ b/recipes/gpe-mixer/gpe-mixer_0.50.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "GPE audio mixer" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ libgpewidget" +PR = "r0" + +inherit gpe autotools pkgconfig +SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
\ No newline at end of file diff --git a/recipes/gsoko/gsoko-0.4.2-gpe6/fix_install.patch b/recipes/gsoko/gsoko-0.4.2-gpe6/fix_install.patch new file mode 100644 index 0000000000..6187e2ad02 --- /dev/null +++ b/recipes/gsoko/gsoko-0.4.2-gpe6/fix_install.patch @@ -0,0 +1,13 @@ +diff --git gsoko-0.4.2-gpe6/Makefile-orig gsoko-0.4.2-gpe6/Makefile +index 1db0ce7..d36392a 100644 +--- gsoko-0.4.2-gpe6/Makefile-orig ++++ gsoko-0.4.2-gpe6/Makefile +@@ -29,7 +29,7 @@ IMGS = box.png box2.png man.png tile.png tile2.png wall.png + + install-program: gsoko gsoko.desktop + install -d $(DESTDIR)$(PREFIX)/bin +- install -s gsoko $(DESTDIR)$(PREFIX)/bin/gsoko ++ install gsoko $(DESTDIR)$(PREFIX)/bin/gsoko + install -d $(DESTDIR)$(PREFIX)/share/gsoko/img + install -d $(DESTDIR)$(PREFIX)/share/gsoko/levels + for i in $(LEVELS); do install -m 644 levels/$$i.lev $(DESTDIR)$(PREFIX)/share/gsoko/levels/$$i.lev; done diff --git a/recipes/gsoko/gsoko_0.4.2-gpe6.bb b/recipes/gsoko/gsoko_0.4.2-gpe6.bb index 6a34be2bc4..f1a513c40c 100644 --- a/recipes/gsoko/gsoko_0.4.2-gpe6.bb +++ b/recipes/gsoko/gsoko_0.4.2-gpe6.bb @@ -6,4 +6,7 @@ DESCRIPTION = "Sokoban game for GTK" PRIORITY = "optional" PR = "r1" -SRC_URI += "file://fix_makefiles.patch;patch=1" +SRC_URI += " \ + file://fix_makefiles.patch;patch=1 \ + file://fix_install.patch;patch=1 \ + " diff --git a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig index ebb6c638f2..d939aa6b42 100644 --- a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig +++ b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.29-omap1 -# Tue Apr 7 18:11:42 2009 +# Mon May 11 13:05:20 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -34,7 +34,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -368,6 +368,7 @@ CONFIG_XFRM=y # CONFIG_XFRM_SUB_POLICY is not set # CONFIG_XFRM_MIGRATE is not set # CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_IPCOMP=m CONFIG_NET_KEY=y # CONFIG_NET_KEY_MIGRATE is not set CONFIG_INET=y @@ -378,62 +379,321 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y -# CONFIG_NET_IPIP is not set -# CONFIG_NET_IPGRE is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m # CONFIG_ARPD is not set # CONFIG_SYN_COOKIES is not set -# CONFIG_INET_AH is not set -# CONFIG_INET_ESP is not set -# CONFIG_INET_IPCOMP is not set -# CONFIG_INET_XFRM_TUNNEL is not set +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m CONFIG_INET_TUNNEL=m CONFIG_INET_XFRM_MODE_TRANSPORT=y CONFIG_INET_XFRM_MODE_TUNNEL=y CONFIG_INET_XFRM_MODE_BEET=y -# CONFIG_INET_LRO is not set -CONFIG_INET_DIAG=y -CONFIG_INET_TCP_DIAG=y -# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_INET_LRO=m +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +# CONFIG_DEFAULT_BIC is not set +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_HTCP is not set +# CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_WESTWOOD is not set +# CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set CONFIG_IPV6=m # CONFIG_IPV6_PRIVACY is not set # CONFIG_IPV6_ROUTER_PREF is not set # CONFIG_IPV6_OPTIMISTIC_DAD is not set -# CONFIG_INET6_AH is not set -# CONFIG_INET6_ESP is not set -# CONFIG_INET6_IPCOMP is not set -# CONFIG_IPV6_MIP6 is not set -# CONFIG_INET6_XFRM_TUNNEL is not set -# CONFIG_INET6_TUNNEL is not set +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m CONFIG_INET6_XFRM_MODE_TRANSPORT=m CONFIG_INET6_XFRM_MODE_TUNNEL=m CONFIG_INET6_XFRM_MODE_BEET=m -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m CONFIG_IPV6_SIT=m CONFIG_IPV6_NDISC_NODETYPE=y -# CONFIG_IPV6_TUNNEL is not set -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_IPV6_MROUTE is not set +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +CONFIG_IPV6_MROUTE=y +# CONFIG_IPV6_PIMSM_V2 is not set # CONFIG_NETWORK_SECMARK is not set -# CONFIG_NETFILTER is not set -# CONFIG_IP_DCCP is not set -# CONFIG_IP_SCTP is not set -# CONFIG_TIPC is not set -# CONFIG_ATM is not set -# CONFIG_BRIDGE is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CT_ACCT=y +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CT_PROTO_DCCP=m +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +# CONFIG_NETFILTER_TPROXY is not set +CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set |