diff options
105 files changed, 3485 insertions, 389 deletions
diff --git a/classes/cpan-base.bbclass b/classes/cpan-base.bbclass index d65b5d944a..379defadb2 100644 --- a/classes/cpan-base.bbclass +++ b/classes/cpan-base.bbclass @@ -10,7 +10,7 @@ RDEPENDS += "${@["perl", ""][(bb.data.inherits_class('native', d))]}" # Determine the staged version of perl from the perl configuration file def get_perl_version(d): import re - cfg = bb.data.expand('${STAGING_LIBDIR}/perl/config.sh', d) + cfg = bb.data.expand('${STAGING_LIBDIR}/perl/config.sh', d) try: f = open(cfg, 'r') except IOError: diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 9ce348ddeb..ce2906159a 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -32,58 +32,57 @@ PACKAGEFUNCS += " do_package_qa " def package_qa_get_machine_dict(): return { "darwin9" : { - "arm" : (40, 0, 0, True, True), + "arm" : ( 40, 0, 0, True, True), }, "linux" : { - "arm" : (40, 97, 0, True, True), - "armeb": (40, 97, 0, False, True), - "powerpc": (20, 0, 0, False, True), - "i386": ( 3, 0, 0, True, True), - "i486": ( 3, 0, 0, True, True), - "i586": ( 3, 0, 0, True, True), - "i686": ( 3, 0, 0, True, True), - "x86_64": (62, 0, 0, True, False), - "ia64": (50, 0, 0, True, False), - "alpha": (36902, 0, 0, True, False), - "hppa": (15, 3, 0, False, True), - "m68k": ( 4, 0, 0, False, True), - "mips": ( 8, 0, 0, False, True), - "mipsel": ( 8, 0, 0, True, True), - "s390": (22, 0, 0, False, True), - "sh4": (42, 0, 0, True, True), - "sparc": ( 2, 0, 0, False, True), + "arm" : ( 40, 97, 0, True, True), + "armeb": ( 40, 97, 0, False, True), + "i386": ( 3, 0, 0, True, True), + "i486": ( 3, 0, 0, True, True), + "i586": ( 3, 0, 0, True, True), + "i686": ( 3, 0, 0, True, True), + "x86_64": ( 62, 0, 0, True, False), + "ia64": ( 50, 0, 0, True, False), + "alpha": (36902, 0, 0, True, False), + "hppa": ( 15, 3, 0, False, True), + "m68k": ( 4, 0, 0, False, True), + "mips": ( 8, 0, 0, False, True), + "mipsel": ( 8, 0, 0, True, True), + "powerpc": ( 20, 0, 0, False, True), + "s390": ( 22, 0, 0, False, True), + "sh4": ( 42, 0, 0, True, True), + "sparc": ( 2, 0, 0, False, True), }, "linux-uclibc" : { - "arm" : ( 40, 97, 0, True, True), - "armeb": ( 40, 97, 0, False, True), - "powerpc": ( 20, 0, 0, False, True), - "i386": ( 3, 0, 0, True, True), - "i486": ( 3, 0, 0, True, True), - "i586": ( 3, 0, 0, True, True), - "i686": ( 3, 0, 0, True, True), - "x86_64": ( 62, 0, 0, True, False), - "mips": ( 8, 0, 0, False, True), - "mipsel": ( 8, 0, 0, True, True), - "avr32": (6317, 0, 0, False, True), - "sh4": (42, 0, 0, True, True), - + "arm" : ( 40, 97, 0, True, True), + "armeb": ( 40, 97, 0, False, True), + "avr32": ( 6317, 0, 0, False, True), + "i386": ( 3, 0, 0, True, True), + "i486": ( 3, 0, 0, True, True), + "i586": ( 3, 0, 0, True, True), + "i686": ( 3, 0, 0, True, True), + "x86_64": ( 62, 0, 0, True, False), + "mips": ( 8, 0, 0, False, True), + "mipsel": ( 8, 0, 0, True, True), + "powerpc": ( 20, 0, 0, False, True), + "sh4": ( 42, 0, 0, True, True), }, "uclinux-uclibc" : { - "bfin": ( 106, 0, 0, True, True), + "bfin": ( 106, 0, 0, True, True), }, "linux-gnueabi" : { - "arm" : (40, 0, 0, True, True), - "armeb" : (40, 0, 0, False, True), + "arm" : ( 40, 0, 0, True, True), + "armeb" : ( 40, 0, 0, False, True), }, "linux-uclibceabi" : { - "arm" : (40, 0, 0, True, True), - "armeb" : (40, 0, 0, False, True), + "arm" : ( 40, 0, 0, True, True), + "armeb" : ( 40, 0, 0, False, True), }, "linux-gnuspe" : { - "powerpc": (20, 0, 0, False, True), + "powerpc": ( 20, 0, 0, False, True), }, "linux-uclibcspe" : { - "powerpc": (20, 0, 0, False, True), + "powerpc": ( 20, 0, 0, False, True), }, } diff --git a/classes/kernel-arch.bbclass b/classes/kernel-arch.bbclass index 8894fa554c..58c8374fa6 100644 --- a/classes/kernel-arch.bbclass +++ b/classes/kernel-arch.bbclass @@ -7,12 +7,12 @@ valid_archs = "alpha cris ia64 \ x86_64 i386 x86 \ m68knommu m68k ppc powerpc ppc64 \ - sparc sparc64 \ + sparc sparc64 \ arm arm26 \ m32r mips \ - sh sh64 um h8300 \ - parisc s390 v850 \ - avr32 blackfin" + sh sh64 um h8300 \ + parisc s390 v850 \ + avr32 blackfin" def map_kernel_arch(a, d): import re @@ -25,7 +25,7 @@ def map_kernel_arch(a, d): elif re.match('mipsel$', a): return 'mips' elif re.match('sh(3|4)$', a): return 'sh' elif re.match('bfin', a): return 'blackfin' - elif a in valid_archs: return a + elif a in valid_archs: return a else: bb.error("cannot map '%s' to a linux kernel architecture" % a) diff --git a/classes/package.bbclass b/classes/package.bbclass index 77a20bf9c5..c3781330bb 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -1029,23 +1029,23 @@ def package_run_hooks(f, d): bb.parse.parse_py.BBHandler.feeder(line, l, fn, os.path.basename(fn), d) line += 1 fp.close() - anonqueue = bb.data.getVar("__anonqueue", d, True) or [] - body = [x['content'] for x in anonqueue] - flag = { 'python' : 1, 'func' : 1 } - bb.data.setVar("__anonfunc", "\n".join(body), d) - bb.data.setVarFlags("__anonfunc", flag, d) - try: - t = bb.data.getVar('T', d) - bb.data.setVar('T', '${TMPDIR}/', d) - bb.build.exec_func("__anonfunc", d) - bb.data.delVar('T', d) - if t: - bb.data.setVar('T', t, d) - except Exception, e: - bb.msg.debug(1, bb.msg.domain.Parsing, "Exception when executing anonymous function: %s" % e) - raise - bb.data.delVar("__anonqueue", d) - bb.data.delVar("__anonfunc", d) + anonqueue = bb.data.getVar("__anonqueue", d, True) or [] + body = [x['content'] for x in anonqueue] + flag = { 'python' : 1, 'func' : 1 } + bb.data.setVar("__anonfunc", "\n".join(body), d) + bb.data.setVarFlags("__anonfunc", flag, d) + try: + t = bb.data.getVar('T', d) + bb.data.setVar('T', '${TMPDIR}/', d) + bb.build.exec_func("__anonfunc", d) + bb.data.delVar('T', d) + if t: + bb.data.setVar('T', t, d) + except Exception, e: + bb.msg.debug(1, bb.msg.domain.Parsing, "Exception when executing anonymous function: %s" % e) + raise + bb.data.delVar("__anonqueue", d) + bb.data.delVar("__anonfunc", d) python package_do_package () { packages = (bb.data.getVar('PACKAGES', d, True) or "").split() diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index 8a98940c09..09e86ae99e 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -259,8 +259,8 @@ python packagestage_scenefunc () { # Remove the stamps and files we added above # FIXME - we should really only remove the stamps we added - for fname in glob.glob(stamp + '.*'): - oe.path.remove(fname) + for fname in glob.glob(stamp + '.*'): + oe.path.remove(fname) oe.path.remove(bb.data.expand("${WORKDIR}/tstage", d)) if stageok: @@ -295,8 +295,8 @@ python packagedstage_stampfixing_eventhandler() { # so we need to remove the autogenerated stamps. for task in taskscovered: covered = "%s.do_%s" % (e.stampPrefix[fn], task) - oe.path.remove(covered) - oe.path.remove(stamp) + oe.path.remove(covered) + oe.path.remove(stamp) } populate_sysroot_preamble () { diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index dfb3010f82..8eb74530a2 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -141,7 +141,7 @@ def check_sanity(e): if not abi.isdigit(): f = file(abifile, "w") f.write(current_abi) - elif abi == "3" and current_abi == "4": + elif abi == "3" and current_abi == "4": import bb bb.note("Converting staging from layout version 2 to layout version 3") os.system(bb.data.expand("mv ${TMPDIR}/staging ${TMPDIR}/sysroots", e.data)) diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index d7f27054b0..ebea48721b 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -19,51 +19,51 @@ def get_siteinfo_list(d): target = bb.data.getVar('HOST_ARCH', d, 1) + "-" + bb.data.getVar('HOST_OS', d, 1) targetinfo = {\ - "armeb-linux": "endian-big bit-32 common-linux common-glibc arm-common",\ - "armeb-linux-gnueabi": "endian-big bit-32 common-linux common-glibc arm-common armeb-linux",\ - "armeb-linux-uclibc": "endian-big bit-32 common-linux common-uclibc arm-common",\ - "armeb-linux-uclibceabi": "endian-big bit-32 common-linux common-uclibc arm-common armeb-linux-uclibc",\ "arm-darwin": "endian-little bit-32 common-darwin",\ "arm-darwin9": "endian-little bit-32 common-darwin",\ "arm-linux": "endian-little bit-32 common-linux common-glibc arm-common",\ "arm-linux-gnueabi": "endian-little bit-32 common-linux common-glibc arm-common arm-linux",\ "arm-linux-uclibc": "endian-little bit-32 common-linux common-uclibc arm-common",\ "arm-linux-uclibceabi": "endian-little bit-32 common-linux common-uclibc arm-common arm-linux-uclibc",\ + "armeb-linux": "endian-big bit-32 common-linux common-glibc arm-common",\ + "armeb-linux-gnueabi": "endian-big bit-32 common-linux common-glibc arm-common armeb-linux",\ + "armeb-linux-uclibc": "endian-big bit-32 common-linux common-uclibc arm-common",\ + "armeb-linux-uclibceabi": "endian-big bit-32 common-linux common-uclibc arm-common armeb-linux-uclibc",\ "avr32-linux-uclibc": "endian-big bit-32 common-linux common-uclibc avr32-common",\ "bfin-uclinux-uclibc": "endian-little bit-32 common-uclibc bfin-common",\ - "i386-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ - "i486-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ - "i586-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ - "i686-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ - "i386-linux-uclibc": "endian-little bit-32 common-linux common-uclibc ix86-common",\ - "i486-linux-uclibc": "endian-little bit-32 common-linux common-uclibc ix86-common",\ - "i586-linux-uclibc": "endian-little bit-32 common-linux common-uclibc ix86-common",\ - "i686-linux-uclibc": "endian-little bit-32 common-linux common-uclibc ix86-common",\ "i386-cygwin": "endian-little bit-32 common-cygwin ix86-common",\ - "i486-cygwin": "endian-little bit-32 common-cygwin ix86-common",\ - "i586-cygwin": "endian-little bit-32 common-cygwin ix86-common",\ - "i686-cygwin": "endian-little bit-32 common-cygwin ix86-common",\ + "i386-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ + "i386-linux-uclibc": "endian-little bit-32 common-linux common-uclibc ix86-common",\ "i386-mingw32": "endian-little bit-32 common-mingw ix86-common",\ + "i486-cygwin": "endian-little bit-32 common-cygwin ix86-common",\ + "i486-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ + "i486-linux-uclibc": "endian-little bit-32 common-linux common-uclibc ix86-common",\ "i486-mingw32": "endian-little bit-32 common-mingw ix86-common",\ + "i586-cygwin": "endian-little bit-32 common-cygwin ix86-common",\ + "i586-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ + "i586-linux-uclibc": "endian-little bit-32 common-linux common-uclibc ix86-common",\ "i586-mingw32": "endian-little bit-32 common-mingw ix86-common",\ + "i686-cygwin": "endian-little bit-32 common-cygwin ix86-common",\ + "i686-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ + "i686-linux-uclibc": "endian-little bit-32 common-linux common-uclibc 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 mips-common",\ - "mipsel-linux-uclibc": "endian-little bit-32 common-linux common-uclibc mips-common",\ + "ia64-linux": "endian-little bit-64 common-linux common-glibc",\ "mips-linux": "endian-big bit-32 common-linux common-glibc mips-common",\ "mips-linux-uclibc": "endian-big bit-32 common-linux common-uclibc mips-common",\ + "mipsel-linux": "endian-little bit-32 common-linux common-glibc mips-common",\ + "mipsel-linux-uclibc": "endian-little bit-32 common-linux common-uclibc mips-common",\ "powerpc-darwin": "endian-big bit-32 common-darwin",\ - "ppc-linux": "endian-big bit-32 common-linux common-glibc powerpc-common powerpc-linux",\ - "ppc64-linux": "endian-big bit-64 common-linux common-glibc powerpc-common powerpc64-linux",\ - "powerpc-linux": "endian-big bit-32 common-linux common-glibc powerpc-common",\ - "powerpc-linux-gnuspe": "endian-big bit-32 common-linux common-glibc powerpc-common powerpc-linux",\ + "powerpc-linux": "endian-big bit-32 common-linux common-glibc powerpc-common",\ + "powerpc-linux-gnuspe": "endian-big bit-32 common-linux common-glibc powerpc-common powerpc-linux",\ "powerpc-linux-uclibc": "endian-big bit-32 common-linux common-uclibc powerpc-common",\ "powerpc-linux-uclibcspe": "endian-big bit-32 common-linux common-uclibc powerpc-common powerpc-linux-uclibc",\ + "ppc-linux": "endian-big bit-32 common-linux common-glibc powerpc-common powerpc-linux",\ + "ppc64-linux": "endian-big bit-64 common-linux common-glibc powerpc-common powerpc64-linux",\ "sh3-linux": "endian-little bit-32 common-linux common-glibc sh-common",\ "sh4-linux": "endian-little bit-32 common-linux common-glibc sh-common",\ "sh4-linux-uclibc": "endian-little bit-32 common-linux common-uclibc sh-common",\ - "sparc-linux": "endian-big bit-32 common-linux common-glibc",\ - "viac3-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ + "sparc-linux": "endian-big bit-32 common-linux common-glibc",\ + "viac3-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ "x86_64-linux": "endian-little bit-64 common-linux common-glibc",\ "x86_64-linux-uclibc": "endian-little bit-64 common-linux common-uclibc"} if target in targetinfo: diff --git a/classes/testlab.bbclass b/classes/testlab.bbclass index e6c9c8e284..bc6b6e5a7f 100644 --- a/classes/testlab.bbclass +++ b/classes/testlab.bbclass @@ -36,14 +36,14 @@ if [ -e ${IMAGE_ROOTFS}/etc/opkg ] && [ "${ONLINE_PACKAGE_MANAGEMENT}" = "full" echo -e "digraph depends {\n node [shape=plaintext]" > ${TESTLAB_DIR}/depends.dot for pkg in $(opkg-cl ${IPKG_ARGS} list_installed | awk '{print $1}') ; do - opkg-cl ${IPKG_ARGS} info $pkg | awk '/Package/ {printf $2"_"} /Version/ {printf $2"_"} /Archi/ {print $2".ipk"}' >> ${TESTLAB_DIR}/installed-packages.txt + opkg-cl ${IPKG_ARGS} info $pkg | awk '/^Package/ {printf $2"_"} /^Version/ {printf $2"_"} /^Archi/ {print $2".ipk"}' >> ${TESTLAB_DIR}/installed-packages.txt - for depends in $(opkg-cl ${IPKG_ARGS} info $pkg | grep Depends) ; do - echo "$pkg OPP $depends;" | grep -v "(" | grep -v ")" | grep -v Depends | sed -e 's:,::g' -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' |sed 's:OPP:->:g' >> ${TESTLAB_DIR}/depends.dot + for depends in $(opkg-cl ${IPKG_ARGS} info $pkg | grep ^Depends) ; do + echo "$pkg OPP $depends;" | grep -v "(" | grep -v ")" | grep -v "$pkg OPP Depends" | sed -e 's:,::g' -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' |sed 's:OPP:->:g' >> ${TESTLAB_DIR}/depends.dot done - for recommends in $(opkg-cl ${IPKG_ARGS} info $pkg | grep Recom) ; do - echo "$pkg OPP $recommends [style=dotted];" | grep -v "(" | grep -v ")" | grep -v Recom | sed -e 's:,::g' -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' |sed 's:OPP:->:g' >> ${TESTLAB_DIR}/depends.dot + for recommends in $(opkg-cl ${IPKG_ARGS} info $pkg | grep ^Recom) ; do + echo "$pkg OPP $recommends [style=dotted];" | grep -v "(" | grep -v ")" | grep -v "$pkg OPP Recom" | sed -e 's:,::g' -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' |sed 's:OPP:->:g' >> ${TESTLAB_DIR}/depends.dot done done diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 397dbc2701..01192948f7 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -266,10 +266,6 @@ RRECOMMENDS_${PN}-dbg = "${PN} (= ${EXTENDPV})" FILES_${PN}-locale = "${datadir}/locale" -# File manifest - -export MANIFEST = "${FILESDIR}/manifest" - # file:// search paths FILE_DIRNAME = "${@os.path.dirname(bb.data.getVar('FILE', d))}" FILESPATHBASE = "${FILE_DIRNAME}" diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 992d6566a3..7c70c84552 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -21,7 +21,7 @@ # stable/2009 branch #DISTRO_VERSION = "2009.X" -DISTRO_VERSION = "2010.4-test-${DATE}" +DISTRO_VERSION = "2010.7-test-${DATE}" DISTRO_REVISION = "3" DISTRO_PR = ".5" diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc index c7683b67c3..84b138146b 100644 --- a/conf/distro/include/preferred-slugos-versions.inc +++ b/conf/distro/include/preferred-slugos-versions.inc @@ -83,3 +83,6 @@ PREFERRED_VERSION_udev ?= "118" # latest tcl recipe has a bug that overwites regex.h; use the old tcl #PREFERRED_VERSION_tcl ?= "8.4.19" + +# We need the bluez4 version of the libs, which has default_precedence = -1 +PREFERRED_VERSION_bluez-libs ?= "4.42" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 1b29537056..92a869aa27 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -2,4 +2,4 @@ # only SRCREVs included in more recipes should be here, otherwise put sane SRCREV to recipe directly OPKG_SRCREV ?= "536" -EFL_SRCREV ?= "49660" +EFL_SRCREV ?= "49761" diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc index 1b77f7573b..f61d218fe3 100644 --- a/conf/distro/include/sane-toolchain.inc +++ b/conf/distro/include/sane-toolchain.inc @@ -141,7 +141,7 @@ ENABLE_BINARY_LOCALE_GENERATION_armv7a = "0" #qemu has taken a dislike to armeb as well ENABLE_BINARY_LOCALE_GENERATION_armeb = "0" def detect_arm_abi (d): - import bb + import bb if bb.data.getVar('DISTRO_FEATURES',d) is None: if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'arm', 'armeb' ]: return "oabi" @@ -159,8 +159,8 @@ def compute_os_portion_of_target_triplet (d): armv5te iwmmxt armv7a armv7 armv5teb armv4t" ppc_spe_supporting_arches = "ppce500v2 ppce500" gnu_suffix = "" - if bb.data.getVar('LIBC', d, 1) == "uclibc": - libc_suffix = "uclibc" + if bb.data.getVar('LIBC', d, 1) == "uclibc": + libc_suffix = "uclibc" else: libc_suffix = "" @@ -170,7 +170,7 @@ def compute_os_portion_of_target_triplet (d): else: os_suffix = "uclinux" else: - os_suffix = "linux" + os_suffix = "linux" bparch = bb.data.getVar('BASE_PACKAGE_ARCH', d,1) if bb.data.getVar('DISTRO_FEATURES',d,1) is not None and \ diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 00a10bf20b..5acf90f97f 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -165,13 +165,13 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" PREFERRED_PROVIDER_avahi ?= "avahi" PREFERRED_PROVIDER_ifupdown ?= "ifupdown" PREFERRED_PROVIDER_gconf ?= "gconf" -PREFERRED_PROVIDER_libqte2 ?= "qte" +PREFERRED_PROVIDER_virtual/libqte2 ?= "qte" PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat" # we use bluez4 instead of the older bluez3 DISTRO_BLUETOOTH_MANAGER = "bluez4" -PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils" -PREFERRED_PROVIDER_bluez-libs = "bluez4" +PREFERRED_PROVIDER_bluez-utils-dbus = "bluez4" +PREFERRED_PROVIDER_bluez-libs = "bluez-libs" PREFERRED_PROVIDER_bluez-utils = "bluez4" # Include any package preferred versions and srcrevs: diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 8147c77bc9..0e347e2567 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -47,7 +47,7 @@ XSERVER_akita = "xserver-kdrive-1300-fbdev" # spitz uses xserver-xorg PREFERRED_PROVIDER_virtual/xserver_spitz = "xserver-xorg" -XSERVER_spitz = "xserver-xorg xf86-input-keyboard xf86-input-mouse xf86-input-evdev" +XSERVER_spitz = "xserver-xorg xf86-video-fbdev xf86-input-keyboard xf86-input-mouse xf86-input-evdev" PREFERRED_PROVIDER_virtual/libgl_spitz = "mesa-dri" diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index 9fcd76e87f..4989a33e9d 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -5,7 +5,8 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "linux-omap" +PREFERRED_PROVIDER_virtual/kernel = "linux" +KERNEL_IMAGETYPE = "uImage" UBOOT_ENTRYPOINT="0x10c08000" diff --git a/recipes/angstrom/angstrom-version.bb b/recipes/angstrom/angstrom-version.bb index 1728c0dff8..a2f1335f9d 100644 --- a/recipes/angstrom/angstrom-version.bb +++ b/recipes/angstrom/angstrom-version.bb @@ -1,9 +1,11 @@ LICENSE = "MIT" PV = "${DISTRO_VERSION}" -PR = "r3" +PR = "r4" PE = "1" +SRC_URI = "file://lsb_release" + PACKAGES = "${PN}" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -17,4 +19,7 @@ do_install() { echo "Built from branch: ${METADATA_BRANCH}" >> ${D}${sysconfdir}/angstrom-version echo "Revision: ${METADATA_REVISION}" >> ${D}${sysconfdir}/angstrom-version echo "Target system: ${TARGET_SYS}" >> ${D}${sysconfdir}/angstrom-version + + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/lsb_release ${D}${bindir}/ } diff --git a/recipes/angstrom/angstrom-version/lsb_release b/recipes/angstrom/angstrom-version/lsb_release new file mode 100755 index 0000000000..11b48141f5 --- /dev/null +++ b/recipes/angstrom/angstrom-version/lsb_release @@ -0,0 +1,43 @@ +#!/bin/sh +VERSION="$(cat /etc/angstrom-version | head -n1 | awk '{print $2}')" +CODENAME="foo" + +case $1 in +"-v") + echo "No LSB modules are available." + ;; +"-i") + echo "Distributor ID: Angstrom" + ;; +"-d") + echo "Description: Angstrom GNU/Linux $VERSION ($CODENAME)" + ;; +"-r") + echo "Release: $VERSION" + ;; +"-c") + echo "Codename: $CODENAME" + ;; +"-a") + echo "Distributor ID: Angstrom" + echo "Description: Angstrom GNU/Linux $VERSION ($CODENAME)" + echo "Release: $VERSION" + echo "Codename: $CODENAME" + ;; +"-s") + echo "No LSB modules are available." + ;; +*) + echo "Usage: lsb_release [options]" + echo "" + echo "Options:" + echo " -h, --help show this help message and exit" + echo " -v, --version show LSB modules this system supports" + echo " -i, --id show distributor ID" + echo " -d, --description show description of this distribution" + echo " -r, --release show release number of this distribution" + echo " -c, --codename show code name of this distribution" + echo " -a, --all show all of the above information" + echo " -s, --short show requested information in short format" +;; +esac diff --git a/recipes/bluez/bluez4_4.47.bb b/recipes/bluez/bluez4_4.47.bb index 33e69a284c..7d939abb97 100644 --- a/recipes/bluez/bluez4_4.47.bb +++ b/recipes/bluez/bluez4_4.47.bb @@ -1,7 +1,6 @@ require bluez4.inc DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_angstrom = "1" DEPENDS += "libsndfile1" PR = "${INC_PR}.1" diff --git a/recipes/bluez/bluez4_4.53.bb b/recipes/bluez/bluez4_4.53.bb index 3462b6eab1..97f7001252 100644 --- a/recipes/bluez/bluez4_4.53.bb +++ b/recipes/bluez/bluez4_4.53.bb @@ -1,7 +1,6 @@ require bluez4.inc DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_angstrom = "1" DEPENDS += "libsndfile1" diff --git a/recipes/bluez/bluez4_4.56.bb b/recipes/bluez/bluez4_4.56.bb index 15892a6985..26b32f511f 100644 --- a/recipes/bluez/bluez4_4.56.bb +++ b/recipes/bluez/bluez4_4.56.bb @@ -1,7 +1,6 @@ require bluez4.inc DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_angstrom = "1" DEFAULT_PREFERENCE_shr = "1" DEPENDS += "libsndfile1" diff --git a/recipes/bluez/bluez4_4.59.bb b/recipes/bluez/bluez4_4.59.bb index e1072e410c..98acf5c299 100644 --- a/recipes/bluez/bluez4_4.59.bb +++ b/recipes/bluez/bluez4_4.59.bb @@ -1,7 +1,6 @@ require bluez4.inc DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_angstrom = "1" DEFAULT_PREFERENCE_shr = "1" DEPENDS += "libsndfile1" diff --git a/recipes/bluez/bluez4_4.66.bb b/recipes/bluez/bluez4_4.66.bb new file mode 100644 index 0000000000..77e743f5bb --- /dev/null +++ b/recipes/bluez/bluez4_4.66.bb @@ -0,0 +1,17 @@ +require bluez4.inc + +SRC_URI[md5sum] = "3c82575778d5dcdd68ea961626b02109" +SRC_URI[sha256sum] = "c223cbb80df0b1f17f6ef4efd0be1fe35ae640bd979f852cfbcc452abc0a7ea5" + +DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_angstrom = "1" + +DEPENDS += "libnl libsndfile1" + +PR = "${INC_PR}.0" + +# Not all distros have a recent enough udev +BTUDEV = " --disable-udevrules" +BTUDEV_angstrom = " --enable-udevrules" +BTUDEV_shr = " --enable-udevrules" +EXTRA_OECONF += "${BTUDEV}" diff --git a/recipes/busybox/busybox_1.15.3.bb b/recipes/busybox/busybox_1.15.3.bb index 07103e855f..6f2e4ec076 100644 --- a/recipes/busybox/busybox_1.15.3.bb +++ b/recipes/busybox/busybox_1.15.3.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" SRC_URI = "\ http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ @@ -29,6 +29,14 @@ SRC_URI = "\ SRC_URI[tarball.md5sum] = "6059ac9456de6fb18dc8ee4cd0ec9240" SRC_URI[tarball.sha256sum] = "d74020ad2cc5a4dcc5109c44dbd0e22582d6ce42954b0f1ff29763c8c0ff03cb" +# gcc 4.5 has this bug on thumb +# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44557 +# so add -fomit-frame-pointer +# this will be removed once the above bug is fixed. + + +CFLAGS_append = " -fomit-frame-pointer" + EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" do_configure_prepend () { diff --git a/recipes/e17/elmdentica_svn.bb b/recipes/e17/elmdentica_svn.bb index c6fb2847e7..566c6570a9 100644 --- a/recipes/e17/elmdentica_svn.bb +++ b/recipes/e17/elmdentica_svn.bb @@ -1,5 +1,5 @@ DESCRIPTION = "A indenti.ca client for E" -DEPENDS = "glib-2.0 gconf libxml2 curl elementary sqlite3-native" +DEPENDS = "glib-2.0 gconf curl elementary sqlite3-native libjson" LICENSE = "GPLv3+" SECTION = "e/apps" HOMEPAGE = "http://elmdentica.googlecode.com" @@ -7,5 +7,5 @@ AUTHOR = "seabra" inherit e -PV = "0.9.0+svnr${SRCPV}" +PV = "0.9.9+svnr${SRCPV}" SRCREV = "${EFL_SRCREV}" diff --git a/recipes/foxtrotgps/foxtrotgps.inc b/recipes/foxtrotgps/foxtrotgps.inc new file mode 100644 index 0000000000..752fa5b948 --- /dev/null +++ b/recipes/foxtrotgps/foxtrotgps.inc @@ -0,0 +1,14 @@ +DESCRIPTION = "FoxtrotGPS is a map and GPS application using OpenStreetMap" +AUTHOR = "Joshua Judson Rosen <rozzin@geekspace.com>" +HOMEPAGE = "http://www.foxtrotgps.org/" +SECTION = "x11/applications" +LICENSE = "GPLv2" +PRIORITY = "optional" +DEPENDS = "curl gtk+ gconf sqlite3 libexif" + +SRC_URI = "http://www.foxtrotgps.org/releases/${P}.tar.gz" + +inherit autotools pkgconfig + +RRECOMMENDS_${PN} = "gpsd" +RRECOMMENDS_${PN}_shr = "fso-gpsd" diff --git a/recipes/foxtrotgps/foxtrotgps_0.99.4.bb b/recipes/foxtrotgps/foxtrotgps_0.99.4.bb new file mode 100644 index 0000000000..61650443b2 --- /dev/null +++ b/recipes/foxtrotgps/foxtrotgps_0.99.4.bb @@ -0,0 +1,4 @@ +require foxtrotgps.inc + +SRC_URI[md5sum] = "73f03ba1ee1853dea077aa18518222f7" +SRC_URI[sha256sum] = "c7fffa0d45f59de0b858c84e57a6325af78f97f3492ef5e4bd75d5bf0c20d689" diff --git a/recipes/freesmartphone/cornucopia.inc b/recipes/freesmartphone/cornucopia.inc index 11cbdd3b78..83bba0bf6c 100644 --- a/recipes/freesmartphone/cornucopia.inc +++ b/recipes/freesmartphone/cornucopia.inc @@ -7,7 +7,7 @@ DEPENDS = "vala-native glib-2.0 dbus dbus-glib libfso-glib libgee" DEPENDS += "${@['libfsoframework', ''][(bb.data.getVar('PN', d, 1) in 'libfsoframework libfsobasics'.split())]}" PV = "invalid, please override" -FSO_CORNUCOPIA_SRCREV ?= "38d52c14a09dd7afc22048f2ed278e336f42a933" +FSO_CORNUCOPIA_SRCREV ?= "3dc9d7ebde32d8c29c901b52f7d3549b774b068b" INC_PR = "r2" SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia;protocol=git;branch=master" diff --git a/recipes/freesmartphone/frameworkd_git.bb b/recipes/freesmartphone/frameworkd_git.bb index 3d72d8f555..c1516d0f32 100644 --- a/recipes/freesmartphone/frameworkd_git.bb +++ b/recipes/freesmartphone/frameworkd_git.bb @@ -4,7 +4,7 @@ AUTHOR = "FreeSmartphone.Org Development Team" SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" -SRCREV = "7ee718456af30a7ab1069c4fad0fd33be319c2c8" +SRCREV = "8f618948c4c74853f28b773cdc74ceefa1fb6899" PV = "0.9.5.9+gitr${SRCPV}" PR = "r4" PE = "1" diff --git a/recipes/freesmartphone/fso-specs_git.bb b/recipes/freesmartphone/fso-specs_git.bb index 345422a3e0..a607f03977 100644 --- a/recipes/freesmartphone/fso-specs_git.bb +++ b/recipes/freesmartphone/fso-specs_git.bb @@ -4,8 +4,8 @@ HOMEPAGE = "http://docs.freesmartphone.org" LICENSE = "BSD" DEPENDS = "libxslt-native" SECTION = "devel/specifications" -SRCREV = "5e5c9b52e7525085f0d8601861d712f05523ad0a" -PV = "2010.05.11.2+gitr${SRCPV}" +SRCREV = "6e6f1a6efc57f52987f0e6cdf86c78abe7c55f25" +PV = "2010.05.29.1+gitr${SRCPV}" PE = "1" PR = "r1" diff --git a/recipes/freesmartphone/libframeworkd-glib_git.bb b/recipes/freesmartphone/libframeworkd-glib_git.bb index 15ef006273..3dacc364d4 100644 --- a/recipes/freesmartphone/libframeworkd-glib_git.bb +++ b/recipes/freesmartphone/libframeworkd-glib_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "freesmartphone.org API glib wrapper" LICENSE = "LGPL" SECTION = "devel" DEPENDS = "dbus-glib" -SRCREV = "43f25d7343145111e70dceaa610decab84366cbb" +SRCREV = "95a266d3ffa17352792d59d16ff8671898d445a2" PV = "0.0.1+gitr${SRCPV}" PE = "1" PR = "r0" diff --git a/recipes/freesmartphone/libfso-glib_git.bb b/recipes/freesmartphone/libfso-glib_git.bb index ecfc9dcd34..31b6f4f07c 100644 --- a/recipes/freesmartphone/libfso-glib_git.bb +++ b/recipes/freesmartphone/libfso-glib_git.bb @@ -3,8 +3,8 @@ AUTHOR = "Didier 'Ptitjes" LICENSE = "LGPL" SECTION = "devel" DEPENDS = "vala-dbus-binding-tool-native dbus-glib glib-2.0 fso-specs" -SRCREV = "5cda3952855d6c4273929449339b04509387bdd2" -PV = "2010.05.11.2+gitr${SRCPV}" +SRCREV = "52d81d44133bf8fe07757e9076007db9e8d8d932" +PV = "2010.05.29.1+gitr${SRCPV}" PE = "1" PR = "r1" diff --git a/recipes/freesmartphone/libfsobasics_git.bb b/recipes/freesmartphone/libfsobasics_git.bb index 3512c13797..42b2ed7f48 100644 --- a/recipes/freesmartphone/libfsobasics_git.bb +++ b/recipes/freesmartphone/libfsobasics_git.bb @@ -3,6 +3,6 @@ require cornucopia.inc DESCRIPTION = "freesmartphone.org support library" DEPENDS += "libnl2" SRCREV = "${FSO_CORNUCOPIA_SRCREV}" -PV = "0.9.9+gitr${SRCPV}" +PV = "0.9.10+gitr${SRCPV}" PE = "1" PR = "${INC_PR}.0" diff --git a/recipes/freesmartphone/mkdump_git.bb b/recipes/freesmartphone/mkdump_git.bb index d3171bbd2c..10098c8a4c 100644 --- a/recipes/freesmartphone/mkdump_git.bb +++ b/recipes/freesmartphone/mkdump_git.bb @@ -7,8 +7,7 @@ SECTION = "console/network" DEPENDS = "libfsoframework" LICENSE = "GPL" -#SRCREV = "${FSO_CORNUCOPIA_SRCREV}" -SRCREV = "696d93d7146adffdb76ddb951a7d8199b3dc8a81" +SRCREV = "${FSO_CORNUCOPIA_SRCREV}" PV = "1.0.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes/freesmartphone/msmcommd_git.bb b/recipes/freesmartphone/msmcommd_git.bb index e1f69bbbf4..738ba26b88 100644 --- a/recipes/freesmartphone/msmcommd_git.bb +++ b/recipes/freesmartphone/msmcommd_git.bb @@ -4,7 +4,7 @@ AUTHOR = "Simon Busch <morphis@gravedo.de>" SECTION = "console/network" LICENSE = "GPL" DEPENDS = "libgee libfsotransport" -SRCREV = "cdbb26ba215cf314cf8ccf25a5e7cbdcb9f7bece" +SRCREV = "f029e181dbcf6b83bcebc24fb7d5dff113e70e63" PV = "0.1.0+gitr${SRCPV}" PR = "r2" PE = "1" diff --git a/recipes/kexecboot/linux-kexecboot/ARM-Add-support-for-LZMA-compressed-kernel-images.patch b/recipes/kexecboot/linux-kexecboot/ARM-Add-support-for-LZMA-compressed-kernel-images.patch deleted file mode 100644 index 6f5e00aa8e..0000000000 --- a/recipes/kexecboot/linux-kexecboot/ARM-Add-support-for-LZMA-compressed-kernel-images.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 350921d..34163da 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -21,6 +21,7 @@ - select HAVE_GENERIC_DMA_COHERENT - select HAVE_KERNEL_GZIP - select HAVE_KERNEL_LZO -+ select HAVE_KERNEL_LZMA - select HAVE_PERF_EVENTS - select PERF_USE_VMALLOC - help -diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile -index 2d4d88b..3906432 100644 ---- a/arch/arm/boot/compressed/Makefile -+++ b/arch/arm/boot/compressed/Makefile -@@ -65,6 +65,7 @@ SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/ - - suffix_$(CONFIG_KERNEL_GZIP) = gzip - suffix_$(CONFIG_KERNEL_LZO) = lzo -+suffix_$(CONFIG_KERNEL_LZMA) = lzma - - targets := vmlinux vmlinux.lds \ - piggy.$(suffix_y) piggy.$(suffix_y).o \ -diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c -index 7e0fe4d..4e35a10 100644 ---- a/arch/arm/boot/compressed/decompress.c -+++ b/arch/arm/boot/compressed/decompress.c -@@ -40,6 +40,10 @@ - #include "../../../../lib/decompress_unlzo.c" - #endif - -+#ifdef CONFIG_KERNEL_LZMA -+#include "../../../../lib/decompress_unlzma.c" -+#endif -+ - void do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x)) - { - decompress(input, len, NULL, NULL, output, NULL, error); -diff --git a/arch/arm/boot/compressed/piggy.lzma.S b/arch/arm/boot/compressed/piggy.lzma.S -new file mode 100644 -index 0000000..d7e69cf ---- /dev/null -+++ b/arch/arm/boot/compressed/piggy.lzma.S -@@ -0,0 +1,6 @@ -+ .section .piggydata,#alloc -+ .globl input_data -+input_data: -+ .incbin "arch/arm/boot/compressed/piggy.lzma" -+ .globl input_data_end -+input_data_end: diff --git a/recipes/kexecboot/linux-kexecboot/spitz/defconfig b/recipes/kexecboot/linux-kexecboot/spitz/defconfig index b38a65976b..73d46130fe 100644 --- a/recipes/kexecboot/linux-kexecboot/spitz/defconfig +++ b/recipes/kexecboot/linux-kexecboot/spitz/defconfig @@ -1,12 +1,13 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.34 -# Mon May 17 09:50:34 2010 +# Linux kernel version: 2.6.35-rc3 +# Sun Jun 20 08:56:48 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_GENERIC_GPIO=y CONFIG_GENERIC_TIME=y +# CONFIG_ARCH_USES_GETTIMEOFFSET is not set CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_HAVE_PROC_CPU=y CONFIG_GENERIC_HARDIRQS=y @@ -33,6 +34,7 @@ CONFIG_CONSTRUCTORS=y CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y @@ -175,9 +177,11 @@ CONFIG_MMU=y # CONFIG_ARCH_INTEGRATOR is not set # CONFIG_ARCH_REALVIEW is not set # CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_VEXPRESS is not set # CONFIG_ARCH_AT91 is not set # CONFIG_ARCH_BCMRING is not set # CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CNS3XXX is not set # CONFIG_ARCH_GEMINI is not set # CONFIG_ARCH_EBSA110 is not set # CONFIG_ARCH_EP93XX is not set @@ -213,7 +217,7 @@ CONFIG_ARCH_PXA=y # CONFIG_ARCH_S3C64XX is not set # CONFIG_ARCH_S5P6440 is not set # CONFIG_ARCH_S5P6442 is not set -# CONFIG_ARCH_S5PC1XX is not set +# CONFIG_ARCH_S5PC100 is not set # CONFIG_ARCH_S5PV210 is not set # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_LH7A40X is not set @@ -222,6 +226,7 @@ CONFIG_ARCH_PXA=y # CONFIG_ARCH_NOMADIK is not set # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_OMAP is not set +# CONFIG_PLAT_SPEAR is not set # # Intel PXA2xx/PXA3xx Implementations @@ -261,6 +266,7 @@ CONFIG_ARCH_PXA=y # CONFIG_MACH_COLIBRI is not set # CONFIG_MACH_COLIBRI300 is not set # CONFIG_MACH_COLIBRI320 is not set +# CONFIG_MACH_VPAC270 is not set # # End-user Products (sorted by vendor name) @@ -289,6 +295,7 @@ CONFIG_MACH_BORZOI=y # CONFIG_MACH_TOSA is not set # CONFIG_MACH_ICONTROL is not set # CONFIG_ARCH_PXA_ESERIES is not set +# CONFIG_MACH_ZIPIT2 is not set CONFIG_PXA27x=y CONFIG_PXA_SHARP_Cxx00=y CONFIG_PXA_SSP=y @@ -327,7 +334,6 @@ CONFIG_COMMON_CLKDEV=y CONFIG_PCCARD=y CONFIG_PCMCIA=y # CONFIG_PCMCIA_LOAD_CIS is not set -# CONFIG_PCMCIA_IOCTL is not set # # PC-card bridges @@ -378,6 +384,7 @@ CONFIG_ALIGNMENT_TRAP=y CONFIG_ZBOOT_ROM_TEXT=0 CONFIG_ZBOOT_ROM_BSS=0 CONFIG_CMDLINE="console=tty1 console=ttyS0,115200n8 fbcon=rotate:1" +# CONFIG_CMDLINE_FORCE is not set # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y CONFIG_ATAGS_PROC=y @@ -454,6 +461,7 @@ CONFIG_MTD_BLOCK=y # CONFIG_INFTL is not set # CONFIG_RFD_FTL is not set # CONFIG_SSFDC is not set +# CONFIG_SM_FTL is not set # CONFIG_MTD_OOPS is not set # @@ -481,6 +489,7 @@ CONFIG_MTD_ROM=y CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_PHYSMAP=y # CONFIG_MTD_PHYSMAP_COMPAT is not set +# CONFIG_MTD_PCMCIA is not set # CONFIG_MTD_GPIO_ADDR is not set # CONFIG_MTD_PLATRAM is not set @@ -501,10 +510,13 @@ CONFIG_MTD_PHYSMAP=y # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_NAND_ECC=y +# CONFIG_MTD_NAND_ECC_SMC is not set CONFIG_MTD_NAND=y CONFIG_MTD_NAND_VERIFY_WRITE=y -# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_SM_COMMON is not set # CONFIG_MTD_NAND_MUSEUM_IDS is not set +CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018 # CONFIG_MTD_NAND_H1900 is not set # CONFIG_MTD_NAND_GPIO is not set CONFIG_MTD_NAND_IDS=y @@ -605,16 +617,15 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_ADP5588 is not set # CONFIG_KEYBOARD_ATKBD is not set # CONFIG_QT2160 is not set -# CONFIG_KEYBOARD_CORGI is not set # CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_GPIO is not set +CONFIG_KEYBOARD_GPIO=y +# CONFIG_KEYBOARD_TCA6416 is not set CONFIG_KEYBOARD_MATRIX=y # CONFIG_KEYBOARD_LM8323 is not set # CONFIG_KEYBOARD_MAX7359 is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_OPENCORES is not set # CONFIG_KEYBOARD_PXA27x is not set -# CONFIG_KEYBOARD_SPITZ is not set # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_XTKBD is not set @@ -627,8 +638,8 @@ CONFIG_TOUCHSCREEN_ADS7846=y # CONFIG_TOUCHSCREEN_AD7879_I2C is not set # CONFIG_TOUCHSCREEN_AD7879_SPI is not set # CONFIG_TOUCHSCREEN_AD7879 is not set -# CONFIG_TOUCHSCREEN_CORGI is not set # CONFIG_TOUCHSCREEN_DYNAPRO is not set +# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_EETI is not set # CONFIG_TOUCHSCREEN_FUJITSU is not set # CONFIG_TOUCHSCREEN_GUNZE is not set @@ -644,6 +655,7 @@ CONFIG_TOUCHSCREEN_ADS7846=y # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set # CONFIG_TOUCHSCREEN_TSC2007 is not set # CONFIG_TOUCHSCREEN_W90X900 is not set +# CONFIG_TOUCHSCREEN_TPS6507X is not set # CONFIG_INPUT_MISC is not set # @@ -677,6 +689,8 @@ CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_TIMBERDALE is not set +# CONFIG_SERIAL_ALTERA_JTAGUART is not set +# CONFIG_SERIAL_ALTERA_UART is not set CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set # CONFIG_LEGACY_PTYS is not set @@ -692,6 +706,7 @@ CONFIG_UNIX98_PTYS=y # CONFIG_CARDMAN_4040 is not set # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set +# CONFIG_RAMOOPS is not set CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y # CONFIG_I2C_COMPAT is not set @@ -708,6 +723,7 @@ CONFIG_I2C_HELPER_AUTO=y # CONFIG_I2C_DESIGNWARE is not set # CONFIG_I2C_GPIO is not set # CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PCA_PLATFORM is not set CONFIG_I2C_PXA=y # CONFIG_I2C_PXA_SLAVE is not set # CONFIG_I2C_SIMTEC is not set @@ -722,7 +738,6 @@ CONFIG_I2C_PXA=y # # Other I2C/SMBus bus drivers # -# CONFIG_I2C_PCA_PLATFORM is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set @@ -780,11 +795,16 @@ CONFIG_GPIOLIB=y # # AC97 GPIO expanders: # + +# +# MODULbus GPIO expanders: +# # CONFIG_W1 is not set CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set CONFIG_PDA_POWER=y CONFIG_APM_POWER=y +# CONFIG_TEST_POWER is not set # CONFIG_BATTERY_DS2760 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_BQ27x00 is not set @@ -843,12 +863,15 @@ CONFIG_SENSORS_MAX1111=y # CONFIG_SENSORS_PCF8591 is not set # CONFIG_SENSORS_SHT15 is not set # CONFIG_SENSORS_DME1737 is not set +# CONFIG_SENSORS_EMC1403 is not set # CONFIG_SENSORS_SMSC47M1 is not set # CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_ADS7828 is not set +# CONFIG_SENSORS_ADS7871 is not set # CONFIG_SENSORS_AMC6821 is not set # CONFIG_SENSORS_THMC50 is not set +# CONFIG_SENSORS_TMP102 is not set # CONFIG_SENSORS_TMP401 is not set # CONFIG_SENSORS_TMP421 is not set # CONFIG_SENSORS_VT1211 is not set @@ -870,10 +893,7 @@ CONFIG_SSB_POSSIBLE=y # Sonics Silicon Backplane # # CONFIG_SSB is not set - -# -# Multifunction device drivers -# +CONFIG_MFD_SUPPORT=y # CONFIG_MFD_CORE is not set # CONFIG_MFD_88PM860X is not set # CONFIG_MFD_SM501 is not set @@ -882,7 +902,9 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_HTC_PASIC3 is not set # CONFIG_HTC_I2CPLD is not set # CONFIG_TPS65010 is not set +# CONFIG_TPS6507X is not set # CONFIG_TWL4030_CORE is not set +# CONFIG_MFD_TC35892 is not set # CONFIG_MFD_TMIO is not set # CONFIG_MFD_T7L66XB is not set # CONFIG_MFD_TC6387XB is not set @@ -896,9 +918,9 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_MFD_WM8994 is not set # CONFIG_MFD_PCF50633 is not set # CONFIG_MFD_MC13783 is not set -# CONFIG_AB3100_CORE is not set +# CONFIG_ABX500_CORE is not set # CONFIG_EZX_PCAP is not set -# CONFIG_AB4500_CORE is not set +# CONFIG_AB8500_CORE is not set # CONFIG_REGULATOR is not set # CONFIG_MEDIA_SUPPORT is not set @@ -946,12 +968,13 @@ CONFIG_LCD_CORGI=y # CONFIG_LCD_L4F00242T03 is not set # CONFIG_LCD_LMS283GF05 is not set # CONFIG_LCD_LTV350QV is not set -# CONFIG_LCD_ILI9320 is not set # CONFIG_LCD_TDO24M is not set # CONFIG_LCD_VGG2432A4 is not set # CONFIG_LCD_PLATFORM is not set +# CONFIG_LCD_S6E63M0 is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_GENERIC=y +# CONFIG_BACKLIGHT_ADP8860 is not set # # Display device support @@ -977,7 +1000,10 @@ CONFIG_FONT_8x16=y # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set -# CONFIG_LOGO is not set +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y # CONFIG_SOUND is not set # CONFIG_HID_SUPPORT is not set # CONFIG_USB_SUPPORT is not set @@ -1035,10 +1061,6 @@ CONFIG_RTC_LIB=y # CONFIG_DMADEVICES is not set # CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set - -# -# TI VLYNQ -# # CONFIG_STAGING is not set # @@ -1086,8 +1108,11 @@ CONFIG_GENERIC_ACL=y # # DOS/FAT/NT Filesystems # -# CONFIG_MSDOS_FS is not set -# CONFIG_VFAT_FS is not set +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # CONFIG_NTFS_FS is not set # @@ -1163,7 +1188,46 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_KARMA_PARTITION is not set # CONFIG_EFI_PARTITION is not set # CONFIG_SYSV68_PARTITION is not set -# CONFIG_NLS is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +# CONFIG_NLS_CODEPAGE_437 is not set +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +# CONFIG_NLS_ISO8859_1 is not set +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_UTF8 is not set # # Kernel hacking @@ -1187,6 +1251,7 @@ CONFIG_FRAME_POINTER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_TRACING_SUPPORT=y # CONFIG_FTRACE is not set +# CONFIG_ATOMIC64_SELFTEST is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_ARM_UNWIND is not set diff --git a/recipes/kexecboot/linux-kexecboot/use-noclone-attribute-for-naked.patch b/recipes/kexecboot/linux-kexecboot/use-noclone-attribute-for-naked.patch new file mode 100644 index 0000000000..72bf4a1e0a --- /dev/null +++ b/recipes/kexecboot/linux-kexecboot/use-noclone-attribute-for-naked.patch @@ -0,0 +1,53 @@ +https://patchwork.kernel.org/patch/104260/ + +This patch add noinline and noclone attributes to naked functions. +GCC 4.5 has new optimization -fipa-ira which is enabled at -Os and -O2 +this option will clone the functions and that can change the standard +calling convention but the naked functions expect that and use +arguments as in standard calling convention. Therefore the naked +functions should not be marked non inline and noclone. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Index: linux-2.6.34/include/linux/compiler-gcc4.h +=================================================================== +--- linux-2.6.34.orig/include/linux/compiler-gcc4.h 2010-05-29 17:18:55.338127623 -0700 ++++ linux-2.6.34/include/linux/compiler-gcc4.h 2010-05-29 17:32:33.910657021 -0700 +@@ -48,6 +48,10 @@ + * unreleased. Really, we need to have autoconf for the kernel. + */ + #define unreachable() __builtin_unreachable() ++ ++/* Mark a function definition as prohibited from being cloned. */ ++#define __noclone __attribute__((__noclone__)) ++ + #endif + + #endif +Index: linux-2.6.34/include/linux/compiler-gcc.h +=================================================================== +--- linux-2.6.34.orig/include/linux/compiler-gcc.h 2010-05-29 17:28:28.238113095 -0700 ++++ linux-2.6.34/include/linux/compiler-gcc.h 2010-05-29 17:31:58.938153321 -0700 +@@ -58,8 +58,12 @@ + * naked functions because then mcount is called without stack and frame pointer + * being set up and there is no chance to restore the lr register to the value + * before mcount was called. ++ * ++ * The asm() bodies of naked functions often depend on standard calling conventions, ++ * therefore they must be noinline and noclone. GCC 4.[56] currently fail to enforce ++ * this, so we must do so ourselves. See GCC PR44290. + */ +-#define __naked __attribute__((naked)) notrace ++#define __naked __attribute__((naked)) noinline __noclone notrace + + #define __noreturn __attribute__((noreturn)) + +@@ -85,3 +89,8 @@ + #define _gcc_header(x) __gcc_header(linux/compiler-gcc##x.h) + #define gcc_header(x) _gcc_header(x) + #include gcc_header(__GNUC__) ++ ++#if !defined(__noclone) ++#define __noclone /* not needed */ ++#endif ++ diff --git a/recipes/kexecboot/linux-kexecboot_git.bb b/recipes/kexecboot/linux-kexecboot_git.bb index 7afd2bcb0f..6e29777617 100644 --- a/recipes/kexecboot/linux-kexecboot_git.bb +++ b/recipes/kexecboot/linux-kexecboot_git.bb @@ -1,11 +1,11 @@ require linux-kexecboot.inc -KERNEL_RELEASE = "2.6.34" -SRCREV = "e40152ee1e1c7a63f4777791863215e3faa37a86" +KERNEL_RELEASE = "2.6.35-rc3" +SRCREV = "7e27d6e778cd87b6f2415515d7127eba53fe5d02" PV = "${KERNEL_RELEASE}+gitr${SRCPV}" SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;branch=master \ - file://ARM-Add-support-for-LZMA-compressed-kernel-images.patch;status=pending \ + file://use-noclone-attribute-for-naked.patch;status=pending \ file://defconfig" S = "${WORKDIR}/git" diff --git a/recipes/libcap/libcap2_2.16.bb b/recipes/libcap/libcap2_2.16.bb index ebcb981525..92cd50fbcb 100644 --- a/recipes/libcap/libcap2_2.16.bb +++ b/recipes/libcap/libcap2_2.16.bb @@ -2,8 +2,8 @@ DESCRIPTION = "Libcap is a library for getting and setting POSIX.1e (formerly PO PRIORITY = "optional" SECTION = "libs" LICENSE = "GPL" -DEPENDS = "bison-native flex-native libattr" -PR = "r0" +DEPENDS = "bison-native flex-native attr" +PR = "r1" BUILD_CFLAGS += "-I${S}/libcap/include" CFLAGS += "-I${S}/libcap/include" @@ -25,11 +25,5 @@ do_install() { oe_libinstall -s -C libcap libcap ${D}${libdir} } -do_stage() { - install -d ${STAGING_INCDIR}/sys - install -m 0644 libcap/include/sys/capability.h ${STAGING_INCDIR}/sys/ - oe_libinstall -s -C libcap libcap ${STAGING_LIBDIR} -} - SRC_URI[md5sum] = "6e2c9d0f3c3118e41cd07288ba9577ce" SRC_URI[sha256sum] = "9c5a41a5577d6f702fe4d29e92f91f1d586a2ef272f6b7fa137bae3f0e76cc2f" diff --git a/recipes/libcgroup/libcgroup_0.36.2.bb b/recipes/libcgroup/libcgroup_0.36.2.bb new file mode 100644 index 0000000000..739d3b6497 --- /dev/null +++ b/recipes/libcgroup/libcgroup_0.36.2.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Libcgroup" +PRIORITY = "optional" +SECTION = "libs" +LICENSE = "GPL" +#DEPENDS = "bison-native flex-native" +PR = "r0" + +inherit autotools pkgconfig + +DEPENDS = "libpam" + +SRC_URI = "http://downloads.sourceforge.net/project/libcg/libcgroup/v0.36.2/v0.36.2.rc/libcgroup-0.36.2.rc.tar.bz2" +S = "${WORKDIR}/libcgroup-${PV}.rc" + + +SRC_URI[md5sum] = "08df957084cba32e2a28ec1e8e8740f5" +SRC_URI[sha256sum] = "35e803a4bf4845bb38ec74cca654e9de5d792758b8b1978a4a699ac6689510c9" + diff --git a/recipes/liboil/liboil_0.3.15.bb b/recipes/liboil/liboil_0.3.15.bb index 70dc5e235e..13e591d8b3 100644 --- a/recipes/liboil/liboil_0.3.15.bb +++ b/recipes/liboil/liboil_0.3.15.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Liboil is a library of simple functions that are optimized for various CPUs." HOMEPAGE = "http://liboil.freedesktop.org/" LICENSE = "various" -PR = "r4" +PR = "r5" DEPENDS = "glib-2.0" @@ -12,9 +12,5 @@ SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz \ inherit autotools pkgconfig -do_stage() { - autotools_stage_all -} - SRC_URI[md5sum] = "11dd39b1ca13ce2e0618d4df8303f137" SRC_URI[sha256sum] = "ae5e3b03a72dd4d12accbe7a6022e4e8570fa309defec9846341384d0a657fd4" diff --git a/recipes/linux/linux-2.6.34/omap5912osk/defconfig b/recipes/linux/linux-2.6.34/omap5912osk/defconfig new file mode 100644 index 0000000000..b7e45b62cd --- /dev/null +++ b/recipes/linux/linux-2.6.34/omap5912osk/defconfig @@ -0,0 +1,1530 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.34 +# Fri Jun 18 00:06:42 2010 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_HAVE_PROC_CPU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_ARCH_HAS_CPUFREQ=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_LZO is not set +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_AUDIT is not set + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_TREE_PREEMPT_RCU is not set +# CONFIG_TINY_RCU is not set +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_CGROUPS is not set +# CONFIG_SYSFS_DEPRECATED_V2 is not set +# CONFIG_RELAY is not set +CONFIG_NAMESPACES=y +# CONFIG_UTS_NS is not set +# CONFIG_IPC_NS is not set +# CONFIG_USER_NS is not set +# CONFIG_PID_NS is not set +# CONFIG_NET_NS is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +CONFIG_RD_LZO=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_PERF_USE_VMALLOC=y + +# +# Kernel Performance Events And Counters +# +# CONFIG_PERF_EVENTS is not set +# CONFIG_PERF_COUNTERS is not set +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLUB_DEBUG=y +CONFIG_COMPAT_BRK=y +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_CLK=y + +# +# GCOV-based kernel profiling +# +# CONFIG_SLOW_WORK is not set +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_BLOCK=y +CONFIG_LBDAF=y +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +# CONFIG_INLINE_SPIN_TRYLOCK is not set +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK is not set +# CONFIG_INLINE_SPIN_LOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_INLINE_SPIN_UNLOCK=y +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_READ_TRYLOCK is not set +# CONFIG_INLINE_READ_LOCK is not set +# CONFIG_INLINE_READ_LOCK_BH is not set +# CONFIG_INLINE_READ_LOCK_IRQ is not set +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set +CONFIG_INLINE_READ_UNLOCK=y +# CONFIG_INLINE_READ_UNLOCK_BH is not set +CONFIG_INLINE_READ_UNLOCK_IRQ=y +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_WRITE_TRYLOCK is not set +# CONFIG_INLINE_WRITE_LOCK is not set +# CONFIG_INLINE_WRITE_LOCK_BH is not set +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set +CONFIG_INLINE_WRITE_UNLOCK=y +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +# CONFIG_MUTEX_SPIN_ON_OWNER is not set +CONFIG_FREEZER=y + +# +# System Type +# +CONFIG_MMU=y +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_BCMRING is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_GEMINI is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_STMP3XXX is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_DOVE is not set +# CONFIG_ARCH_KIRKWOOD is not set +# CONFIG_ARCH_LOKI is not set +# CONFIG_ARCH_MV78XX0 is not set +# CONFIG_ARCH_ORION5X is not set +# CONFIG_ARCH_MMP is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_W90X900 is not set +# CONFIG_ARCH_NUC93X is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_MSM is not set +# CONFIG_ARCH_SHMOBILE is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_S3C64XX is not set +# CONFIG_ARCH_S5P6440 is not set +# CONFIG_ARCH_S5P6442 is not set +# CONFIG_ARCH_S5PC1XX is not set +# CONFIG_ARCH_S5PV210 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_U300 is not set +# CONFIG_ARCH_U8500 is not set +# CONFIG_ARCH_NOMADIK is not set +# CONFIG_ARCH_DAVINCI is not set +CONFIG_ARCH_OMAP=y + +# +# TI OMAP Implementations +# +CONFIG_ARCH_OMAP_OTG=y +CONFIG_ARCH_OMAP1=y +# CONFIG_ARCH_OMAP2PLUS is not set + +# +# OMAP Feature Selections +# +CONFIG_OMAP_RESET_CLOCKS=y +CONFIG_OMAP_MUX=y +# CONFIG_OMAP_MUX_DEBUG is not set +CONFIG_OMAP_MUX_WARNINGS=y +CONFIG_OMAP_MCBSP=y +# CONFIG_OMAP_MBOX_FWK is not set +# CONFIG_OMAP_MPU_TIMER is not set +CONFIG_OMAP_32K_TIMER=y +CONFIG_OMAP_32K_TIMER_HZ=128 +# CONFIG_OMAP_DM_TIMER is not set +CONFIG_OMAP_SERIAL_WAKE=y +# CONFIG_OMAP_PM_NONE is not set +CONFIG_OMAP_PM_NOOP=y + +# +# OMAP Core Type +# +# CONFIG_ARCH_OMAP730 is not set +# CONFIG_ARCH_OMAP850 is not set +# CONFIG_ARCH_OMAP15XX is not set +CONFIG_ARCH_OMAP16XX=y + +# +# OMAP Board Type +# +# CONFIG_MACH_OMAP_INNOVATOR is not set +# CONFIG_MACH_OMAP_H2 is not set +# CONFIG_MACH_OMAP_H3 is not set +CONFIG_MACH_OMAP_OSK=y +# CONFIG_OMAP_OSK_MISTRAL is not set +# CONFIG_MACH_NOKIA770 is not set +# CONFIG_MACH_OMAP_GENERIC is not set + +# +# OMAP CPU Speed +# +# CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set +# CONFIG_OMAP_ARM_216MHZ is not set +CONFIG_OMAP_ARM_192MHZ=y +# CONFIG_OMAP_ARM_168MHZ is not set +# CONFIG_OMAP_ARM_120MHZ is not set +# CONFIG_OMAP_ARM_60MHZ is not set +# CONFIG_OMAP_ARM_30MHZ is not set + +# +# Processor Type +# +# CONFIG_CPU_ARM925T is not set +CONFIG_CPU_ARM926T=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5TJ=y +CONFIG_CPU_PABRT_LEGACY=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_WRITETHROUGH is not set +# CONFIG_CPU_CACHE_ROUND_ROBIN is not set +CONFIG_ARM_L1_CACHE_SHIFT=5 +CONFIG_COMMON_CLKDEV=y + +# +# Bus support +# +# CONFIG_PCI_SYSCALL is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set +CONFIG_PCCARD=y +CONFIG_PCMCIA=y +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_PCMCIA_IOCTL=y + +# +# PC-card bridges +# +CONFIG_OMAP_CF=y + +# +# Kernel Features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +# CONFIG_HIGH_RES_TIMERS is not set +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT is not set +CONFIG_HZ=128 +CONFIG_AEABI=y +# CONFIG_OABI_COMPAT is not set +CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +# CONFIG_HIGHMEM is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=999999 +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=0 +CONFIG_VIRT_TO_BUS=y +# CONFIG_KSM is not set +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +# CONFIG_LEDS is not set +CONFIG_ALIGNMENT_TRAP=y +# CONFIG_UACCESS_WITH_MEMCPY is not set + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x10400000,8M root=/dev/ram0 rw" +# CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set + +# +# CPU Power Management +# +# CONFIG_CPU_FREQ is not set +# CONFIG_CPU_IDLE is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +# CONFIG_VFP is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_HAVE_AOUT=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set + +# +# Power management options +# +CONFIG_PM=y +# CONFIG_PM_DEBUG is not set +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +# CONFIG_APM_EMULATION is not set +# CONFIG_PM_RUNTIME is not set +CONFIG_PM_OPS=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=m +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +# CONFIG_NET_KEY is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_IP_MROUTE is not set +# 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_TUNNEL is not set +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_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IPV6 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_RDS is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_NET_DSA is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_PHONET is not set +# CONFIG_IEEE802154 is not set +# CONFIG_NET_SCHED is not set +# CONFIG_DCB is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set +CONFIG_WIRELESS=y +# CONFIG_CFG80211 is not set +# CONFIG_LIB80211 is not set + +# +# CFG80211 needs to be enabled for MAC80211 +# +# CONFIG_WIMAX is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_TESTS is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_MTD_OOPS is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_GEN_PROBE=y +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=y +# CONFIG_MTD_CFI_AMDSTD is not set +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +# CONFIG_MTD_ARM_INTEGRATOR is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +# CONFIG_MTD_NAND is not set +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +# CONFIG_MTD_LPDDR is not set + +# +# UBI - Unsorted block images +# +# CONFIG_MTD_UBI is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set + +# +# DRBD disabled because PROC_FS, INET or CONNECTOR not selected +# +# CONFIG_BLK_DEV_NBD is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=8192 +# CONFIG_BLK_DEV_XIP is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +# CONFIG_MG_DISK is not set +CONFIG_MISC_DEVICES=y +# CONFIG_AD525X_DPOT is not set +# CONFIG_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_ISL29003 is not set +# CONFIG_SENSORS_TSL2550 is not set +# CONFIG_DS1682 is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +# CONFIG_EEPROM_AT24 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_MAX6875 is not set +# CONFIG_EEPROM_93CX6 is not set +CONFIG_HAVE_IDE=y +CONFIG_IDE=m + +# +# Please see Documentation/ide/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_IDE_GD=m +CONFIG_IDE_GD_ATA=y +# CONFIG_IDE_GD_ATAPI is not set +CONFIG_BLK_DEV_IDECS=m +# CONFIG_BLK_DEV_IDECD is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_IDE_TASK_IOCTL is not set +CONFIG_IDE_PROC_FS=y + +# +# IDE chipset support/bugfixes +# +# CONFIG_BLK_DEV_PLATFORM is not set +# CONFIG_BLK_DEV_IDEDMA is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=y +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set +# CONFIG_SCSI_DMA is not set +# CONFIG_SCSI_NETLINK is not set +# CONFIG_ATA is not set +# CONFIG_MD is not set +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_VETH is not set +# CONFIG_PHYLIB is not set +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_AX88796 is not set +CONFIG_SMC91X=y +# CONFIG_DM9000 is not set +# CONFIG_ETHOC is not set +# CONFIG_SMC911X is not set +# CONFIG_SMSC911X is not set +# CONFIG_DNET is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +# CONFIG_B44 is not set +# CONFIG_KS8842 is not set +# CONFIG_KS8851_MLL is not set +CONFIG_NETDEV_1000=y +CONFIG_NETDEV_10000=y +CONFIG_WLAN=y +# CONFIG_PCMCIA_RAYCS is not set +# CONFIG_ATMEL is not set +# CONFIG_AIRO_CS is not set +# CONFIG_PCMCIA_WL3501 is not set +# CONFIG_HOSTAP is not set + +# +# Enable WiMAX (Networking options) to see the WiMAX drivers +# +# CONFIG_NET_PCMCIA is not set +# CONFIG_WAN is not set +CONFIG_PPP=y +CONFIG_PPP_MULTILINK=y +# CONFIG_PPP_FILTER is not set +# CONFIG_PPP_ASYNC is not set +# CONFIG_PPP_SYNC_TTY is not set +# CONFIG_PPP_DEFLATE is not set +# CONFIG_PPP_BSDCOMP is not set +# CONFIG_PPP_MPPE is not set +# CONFIG_PPPOE is not set +# CONFIG_PPPOL2TP is not set +# CONFIG_SLIP is not set +CONFIG_SLHC=y +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_ISDN is not set +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set +# CONFIG_INPUT_SPARSEKMAP is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ADP5588 is not set +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_QT2160 is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_GPIO is not set +# CONFIG_KEYBOARD_MATRIX is not set +# CONFIG_KEYBOARD_MAX7359 is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +CONFIG_KEYBOARD_OMAP=y +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_AD7879_I2C is not set +# CONFIG_TOUCHSCREEN_AD7879 is not set +# CONFIG_TOUCHSCREEN_DYNAPRO is not set +# CONFIG_TOUCHSCREEN_EETI is not set +# CONFIG_TOUCHSCREEN_FUJITSU is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set +# CONFIG_TOUCHSCREEN_MCS5000 is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_INEXIO is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set +# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +# CONFIG_TOUCHSCREEN_TSC2007 is not set +# CONFIG_TOUCHSCREEN_W90X900 is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_DEVKMEM=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +# CONFIG_SERIAL_8250_CS is not set +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_TIMBERDALE is not set +CONFIG_UNIX98_PTYS=y +CONFIG_DEVPTS_MULTIPLE_INSTANCES=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +# CONFIG_IPMI_HANDLER is not set +CONFIG_HW_RANDOM=m +# CONFIG_HW_RANDOM_TIMERIOMEM is not set +CONFIG_HW_RANDOM_OMAP=m +# CONFIG_R3964 is not set + +# +# PCMCIA character devices +# +# CONFIG_SYNCLINK_CS is not set +# CONFIG_CARDMAN_4000 is not set +# CONFIG_CARDMAN_4040 is not set +# CONFIG_IPWIRELESS is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_HELPER_AUTO=y + +# +# I2C Hardware Bus support +# + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_DESIGNWARE is not set +# CONFIG_I2C_GPIO is not set +# CONFIG_I2C_OCORES is not set +CONFIG_I2C_OMAP=y +# CONFIG_I2C_SIMTEC is not set +# CONFIG_I2C_XILINX is not set + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_TAOS_EVM is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_SPI is not set + +# +# PPS support +# +# CONFIG_PPS is not set +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +# CONFIG_GPIO_SYSFS is not set + +# +# Memory mapped GPIO expanders: +# +# CONFIG_GPIO_IT8761E is not set + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_MAX7300 is not set +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set +# CONFIG_GPIO_ADP5588 is not set + +# +# PCI GPIO expanders: +# + +# +# SPI GPIO expanders: +# + +# +# AC97 GPIO expanders: +# +# CONFIG_W1 is not set +# CONFIG_POWER_SUPPLY is not set +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +# CONFIG_SENSORS_AD7414 is not set +# CONFIG_SENSORS_AD7418 is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1029 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ADT7411 is not set +# CONFIG_SENSORS_ADT7462 is not set +# CONFIG_SENSORS_ADT7470 is not set +# CONFIG_SENSORS_ADT7475 is not set +# CONFIG_SENSORS_ASC7621 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_F71882FG is not set +# CONFIG_SENSORS_F75375S is not set +# CONFIG_SENSORS_G760A is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM73 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_LM93 is not set +# CONFIG_SENSORS_LTC4215 is not set +# CONFIG_SENSORS_LTC4245 is not set +# CONFIG_SENSORS_LM95241 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_MAX6650 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_SHT15 is not set +# CONFIG_SENSORS_DME1737 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_ADS7828 is not set +# CONFIG_SENSORS_AMC6821 is not set +# CONFIG_SENSORS_THMC50 is not set +# CONFIG_SENSORS_TMP401 is not set +# CONFIG_SENSORS_TMP421 is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83L786NG is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_SENSORS_LIS3_I2C is not set +# CONFIG_THERMAL is not set +# CONFIG_WATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +# CONFIG_SSB is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_CORE is not set +# CONFIG_MFD_88PM860X is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_HTC_I2CPLD is not set +CONFIG_TPS65010=y +# CONFIG_TWL4030_CORE is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_T7L66XB is not set +# CONFIG_MFD_TC6387XB is not set +# CONFIG_MFD_TC6393XB is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_MAX8925 is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM831X is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_WM8994 is not set +# CONFIG_MFD_PCF50633 is not set +# CONFIG_AB3100_CORE is not set +# CONFIG_REGULATOR is not set +# CONFIG_MEDIA_SUPPORT is not set + +# +# Graphics support +# +# CONFIG_VGASTATE is not set +CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set +# CONFIG_FB_SYS_FOPS is not set +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +CONFIG_FB_OMAP=y +# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set +# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set +CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 +# CONFIG_FB_OMAP_DMA_TUNE is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_SOUND is not set +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HIDRAW is not set +# CONFIG_HID_PID is not set + +# +# Special HID drivers +# +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB is not set + +# +# Enable Host or Gadget support to see Inventra options +# + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# +# CONFIG_USB_GADGET is not set + +# +# OTG and related infrastructure +# +# CONFIG_MMC is not set +# CONFIG_MEMSTICK is not set +# CONFIG_NEW_LEDS is not set +# CONFIG_ACCESSIBILITY is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1374 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_M41T80 is not set +# CONFIG_RTC_DRV_BQ32K is not set +# CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set +# CONFIG_RTC_DRV_RX8581 is not set +# CONFIG_RTC_DRV_RX8025 is not set + +# +# SPI RTC drivers +# + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_MSM6242 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_RP5C01 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +# CONFIG_RTC_DRV_OMAP is not set +# CONFIG_DMADEVICES is not set +# CONFIG_AUXDISPLAY is not set +# CONFIG_UIO is not set + +# +# TI VLYNQ +# +# CONFIG_STAGING is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +# CONFIG_EXT3_FS is not set +# CONFIG_EXT4_FS is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_BTRFS_FS is not set +# CONFIG_NILFS2_FS is not set +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +CONFIG_AUTOFS_FS=y +CONFIG_AUTOFS4_FS=y +# CONFIG_FUSE_FS is not set + +# +# Caches +# +# CONFIG_FSCACHE is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +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 + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +# CONFIG_TMPFS is not set +# CONFIG_HUGETLB_PAGE is not set +# CONFIG_CONFIGFS_FS is not set +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_LOGFS is not set +# CONFIG_CRAMFS is not set +# CONFIG_SQUASHFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_OMFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set +CONFIG_ROOT_NFS=y +# CONFIG_NFSD is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +# CONFIG_CEPH_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y +CONFIG_NLS=m +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=m +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=m +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_UTF8 is not set +# CONFIG_DLM is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +CONFIG_DETECT_HUNG_TASK=y +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 +CONFIG_SCHED_DEBUG=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_WRITECOUNT is not set +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_RCU_CPU_STALL_DETECTOR=y +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +# CONFIG_SYSCTL_SYSCALL_CHECK is not set +# CONFIG_PAGE_POISONING is not set +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_TRACING_SUPPORT=y +# CONFIG_FTRACE is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +CONFIG_ARM_UNWIND=y +CONFIG_DEBUG_USER=y +# CONFIG_DEBUG_ERRORS is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_LL is not set +# CONFIG_OC_ETM is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +# CONFIG_DEFAULT_SECURITY_SELINUX is not set +# CONFIG_DEFAULT_SECURITY_SMACK is not set +# CONFIG_DEFAULT_SECURITY_TOMOYO is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +# CONFIG_CRYPTO_FIPS is not set +CONFIG_CRYPTO_ALGAPI=m +CONFIG_CRYPTO_ALGAPI2=m +CONFIG_CRYPTO_RNG=m +CONFIG_CRYPTO_RNG2=m +# CONFIG_CRYPTO_MANAGER is not set +# CONFIG_CRYPTO_MANAGER2 is not set +# CONFIG_CRYPTO_GF128MUL is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_CRYPTD is not set +# CONFIG_CRYPTO_AUTHENC is not set +# CONFIG_CRYPTO_TEST is not set + +# +# Authenticated Encryption with Associated Data +# +# CONFIG_CRYPTO_CCM is not set +# CONFIG_CRYPTO_GCM is not set +# CONFIG_CRYPTO_SEQIV is not set + +# +# Block modes +# +# CONFIG_CRYPTO_CBC is not set +# CONFIG_CRYPTO_CTR is not set +# CONFIG_CRYPTO_CTS is not set +# CONFIG_CRYPTO_ECB is not set +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_PCBC is not set +# CONFIG_CRYPTO_XTS is not set + +# +# Hash modes +# +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_VMAC is not set + +# +# Digest +# +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_GHASH is not set +# CONFIG_CRYPTO_MD4 is not set +# CONFIG_CRYPTO_MD5 is not set +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_RMD128 is not set +# CONFIG_CRYPTO_RMD160 is not set +# CONFIG_CRYPTO_RMD256 is not set +# CONFIG_CRYPTO_RMD320 is not set +# CONFIG_CRYPTO_SHA1 is not set +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_WP512 is not set + +# +# Ciphers +# +CONFIG_CRYPTO_AES=m +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_ARC4 is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_DES is not set +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_TWOFISH is not set + +# +# Compression +# +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_ZLIB is not set +# CONFIG_CRYPTO_LZO is not set + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_HW=y +# CONFIG_BINARY_PRINTF is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_LAST_BIT=y +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +# CONFIG_CRC_T10DIF is not set +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +# CONFIG_CRC7 is not set +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_DECOMPRESS_LZO=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_NLATTR=y +CONFIG_GENERIC_ATOMIC64=y diff --git a/recipes/linux/linux-omap_2.6.31.bb b/recipes/linux/linux-omap_2.6.31.bb index 2fc2add43a..59faa03cf0 100644 --- a/recipes/linux/linux-omap_2.6.31.bb +++ b/recipes/linux/linux-omap_2.6.31.bb @@ -7,7 +7,6 @@ COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard| DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_omapzoom2 = "1" -DEFAULT_PREFERENCE_omap5912osk = "1" SRCREV = "945044d157dd63c6af0f2ed40a5346382af94eb4" diff --git a/recipes/linux/linux-openmoko-2.6.34_git.bb b/recipes/linux/linux-openmoko-2.6.34_git.bb index 06095dcc91..5497a5479a 100644 --- a/recipes/linux/linux-openmoko-2.6.34_git.bb +++ b/recipes/linux/linux-openmoko-2.6.34_git.bb @@ -3,7 +3,7 @@ require linux-openmoko.inc KERNEL_RELEASE="2.6.34" -SRCREV = "f37686260161644129601ba19880abe48c56cc8d" +SRCREV = "5c40321e6e6a8ca8552c5c69d041d7f7f3205318" OEV = "oe4" PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}" diff --git a/recipes/linux/linux.inc b/recipes/linux/linux.inc index e0205890cd..8d430e27d9 100644 --- a/recipes/linux/linux.inc +++ b/recipes/linux/linux.inc @@ -164,6 +164,23 @@ do_configure_prepend() { echo 'CONFIG_DEVTMPFS_MOUNT=y' >> ${S}/.config fi + # Newer inits like systemd need cgroup support + if [ "${KERNEL_ENABLE_CGROUPS}" = "1" ] ; then + sed -e /CONFIG_CGROUP_SCHED/d \ + -e /CONFIG_CGROUPS/d \ + -i '${S}/.config' + + echo 'CONFIG_CGROUP_SCHED=y' >> ${S}/.config + echo 'CONFIG_CGROUPS=y' >> ${S}/.config + echo 'CONFIG_CGROUP_NS=y' >> ${S}/.config + echo 'CONFIG_CGROUP_FREEZER=y' >> ${S}/.config + echo 'CONFIG_CGROUP_DEVICE=y' >> ${S}/.config + echo 'CONFIG_CPUSETS=y' >> ${S}/.config + echo 'CONFIG_PROC_PID_CPUSET=y' >> ${S}/.config + echo 'CONFIG_CGROUP_CPUACCT=y' >> ${S}/.config + echo 'CONFIG_RESOURCE_COUNTERS=y' >> ${S}/.config + fi + # # root-over-nfs-over-usb-eth support. Limited, but should cover some cases. # Enable this by setting a proper CMDLINE_NFSROOT_USB. diff --git a/recipes/linux/linux/ARM-Add-support-for-LZMA-compressed-kernel-images.patch b/recipes/linux/linux/ARM-Add-support-for-LZMA-compressed-kernel-images.patch deleted file mode 100644 index 6f5e00aa8e..0000000000 --- a/recipes/linux/linux/ARM-Add-support-for-LZMA-compressed-kernel-images.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 350921d..34163da 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -21,6 +21,7 @@ - select HAVE_GENERIC_DMA_COHERENT - select HAVE_KERNEL_GZIP - select HAVE_KERNEL_LZO -+ select HAVE_KERNEL_LZMA - select HAVE_PERF_EVENTS - select PERF_USE_VMALLOC - help -diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile -index 2d4d88b..3906432 100644 ---- a/arch/arm/boot/compressed/Makefile -+++ b/arch/arm/boot/compressed/Makefile -@@ -65,6 +65,7 @@ SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/ - - suffix_$(CONFIG_KERNEL_GZIP) = gzip - suffix_$(CONFIG_KERNEL_LZO) = lzo -+suffix_$(CONFIG_KERNEL_LZMA) = lzma - - targets := vmlinux vmlinux.lds \ - piggy.$(suffix_y) piggy.$(suffix_y).o \ -diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c -index 7e0fe4d..4e35a10 100644 ---- a/arch/arm/boot/compressed/decompress.c -+++ b/arch/arm/boot/compressed/decompress.c -@@ -40,6 +40,10 @@ - #include "../../../../lib/decompress_unlzo.c" - #endif - -+#ifdef CONFIG_KERNEL_LZMA -+#include "../../../../lib/decompress_unlzma.c" -+#endif -+ - void do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x)) - { - decompress(input, len, NULL, NULL, output, NULL, error); -diff --git a/arch/arm/boot/compressed/piggy.lzma.S b/arch/arm/boot/compressed/piggy.lzma.S -new file mode 100644 -index 0000000..d7e69cf ---- /dev/null -+++ b/arch/arm/boot/compressed/piggy.lzma.S -@@ -0,0 +1,6 @@ -+ .section .piggydata,#alloc -+ .globl input_data -+input_data: -+ .incbin "arch/arm/boot/compressed/piggy.lzma" -+ .globl input_data_end -+input_data_end: diff --git a/recipes/linux/linux/spitz/defconfig b/recipes/linux/linux/spitz/defconfig index 6b7d13213e..79231c7535 100644 --- a/recipes/linux/linux/spitz/defconfig +++ b/recipes/linux/linux/spitz/defconfig @@ -1,12 +1,13 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.34 -# Mon May 17 09:31:07 2010 +# Linux kernel version: 2.6.35-rc3 +# Sun Jun 20 08:14:33 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_GENERIC_GPIO=y CONFIG_GENERIC_TIME=y +# CONFIG_ARCH_USES_GETTIMEOFFSET is not set CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_HAVE_PROC_CPU=y CONFIG_GENERIC_HARDIRQS=y @@ -33,6 +34,7 @@ CONFIG_CONSTRUCTORS=y CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y @@ -179,9 +181,11 @@ CONFIG_MMU=y # CONFIG_ARCH_INTEGRATOR is not set # CONFIG_ARCH_REALVIEW is not set # CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_VEXPRESS is not set # CONFIG_ARCH_AT91 is not set # CONFIG_ARCH_BCMRING is not set # CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CNS3XXX is not set # CONFIG_ARCH_GEMINI is not set # CONFIG_ARCH_EBSA110 is not set # CONFIG_ARCH_EP93XX is not set @@ -217,7 +221,7 @@ CONFIG_ARCH_PXA=y # CONFIG_ARCH_S3C64XX is not set # CONFIG_ARCH_S5P6440 is not set # CONFIG_ARCH_S5P6442 is not set -# CONFIG_ARCH_S5PC1XX is not set +# CONFIG_ARCH_S5PC100 is not set # CONFIG_ARCH_S5PV210 is not set # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_LH7A40X is not set @@ -226,6 +230,7 @@ CONFIG_ARCH_PXA=y # CONFIG_ARCH_NOMADIK is not set # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_OMAP is not set +# CONFIG_PLAT_SPEAR is not set # # Intel PXA2xx/PXA3xx Implementations @@ -265,6 +270,7 @@ CONFIG_ARCH_PXA=y # CONFIG_MACH_COLIBRI is not set # CONFIG_MACH_COLIBRI300 is not set # CONFIG_MACH_COLIBRI320 is not set +# CONFIG_MACH_VPAC270 is not set # # End-user Products (sorted by vendor name) @@ -293,6 +299,7 @@ CONFIG_MACH_SPITZ=y # CONFIG_MACH_TOSA is not set # CONFIG_MACH_ICONTROL is not set # CONFIG_ARCH_PXA_ESERIES is not set +# CONFIG_MACH_ZIPIT2 is not set CONFIG_PXA27x=y CONFIG_PXA_SHARP_Cxx00=y CONFIG_PXA_SSP=y @@ -331,7 +338,6 @@ CONFIG_COMMON_CLKDEV=y CONFIG_PCCARD=y CONFIG_PCMCIA=y CONFIG_PCMCIA_LOAD_CIS=y -# CONFIG_PCMCIA_IOCTL is not set # # PC-card bridges @@ -360,6 +366,7 @@ CONFIG_AEABI=y # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set # CONFIG_HIGHMEM is not set +CONFIG_HW_PERF_EVENTS=y CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y # CONFIG_DISCONTIGMEM_MANUAL is not set @@ -382,6 +389,7 @@ CONFIG_ALIGNMENT_TRAP=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE=" debug " +# CONFIG_CMDLINE_FORCE is not set # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y CONFIG_ATAGS_PROC=y @@ -508,6 +516,16 @@ CONFIG_NF_CONNTRACK_SIP=m # CONFIG_NF_CT_NETLINK is not set # CONFIG_NETFILTER_TPROXY is not set CONFIG_NETFILTER_XTABLES=m + +# +# Xtables combined modules +# +# CONFIG_NETFILTER_XT_MARK is not set +# CONFIG_NETFILTER_XT_CONNMARK is not set + +# +# Xtables targets +# # CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set # CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set # CONFIG_NETFILTER_XT_TARGET_CT is not set @@ -519,9 +537,14 @@ CONFIG_NETFILTER_XT_TARGET_HL=m # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set # CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set +# CONFIG_NETFILTER_XT_TARGET_TEE is not set # CONFIG_NETFILTER_XT_TARGET_TRACE is not set # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set + +# +# Xtables matches +# # CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set # CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set @@ -605,6 +628,7 @@ CONFIG_IP_NF_ARP_MANGLE=m # CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set +# CONFIG_L2TP is not set # CONFIG_BRIDGE is not set # CONFIG_NET_DSA is not set # CONFIG_VLAN_8021Q is not set @@ -669,6 +693,7 @@ CONFIG_PXA_FICP=m # CONFIG_MCS_FIR is not set CONFIG_BT=m CONFIG_BT_L2CAP=m +# CONFIG_BT_L2CAP_EXT_FEATURES is not set CONFIG_BT_SCO=m CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y @@ -717,11 +742,14 @@ CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m +# CONFIG_MAC80211_HAS_RC is not set # CONFIG_MAC80211_RC_PID is not set # CONFIG_MAC80211_RC_MINSTREL is not set -# CONFIG_MAC80211_RC_DEFAULT_PID is not set -# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set CONFIG_MAC80211_RC_DEFAULT="" + +# +# Some wireless drivers require a rate control algorithm +# # CONFIG_MAC80211_MESH is not set # CONFIG_MAC80211_LEDS is not set # CONFIG_MAC80211_DEBUGFS is not set @@ -729,6 +757,7 @@ CONFIG_MAC80211_RC_DEFAULT="" # CONFIG_WIMAX is not set # CONFIG_RFKILL is not set # CONFIG_NET_9P is not set +# CONFIG_CAIF is not set # # Device Drivers @@ -768,6 +797,7 @@ CONFIG_MTD_BLOCK=y # CONFIG_INFTL is not set # CONFIG_RFD_FTL is not set # CONFIG_SSFDC is not set +# CONFIG_SM_FTL is not set # CONFIG_MTD_OOPS is not set # @@ -795,6 +825,7 @@ CONFIG_MTD_ROM=y CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_PHYSMAP=y # CONFIG_MTD_PHYSMAP_COMPAT is not set +# CONFIG_MTD_PCMCIA is not set # CONFIG_MTD_GPIO_ADDR is not set # CONFIG_MTD_PLATRAM is not set @@ -815,10 +846,13 @@ CONFIG_MTD_PHYSMAP=y # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_NAND_ECC=y +# CONFIG_MTD_NAND_ECC_SMC is not set CONFIG_MTD_NAND=y CONFIG_MTD_NAND_VERIFY_WRITE=y -# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_SM_COMMON is not set # CONFIG_MTD_NAND_MUSEUM_IDS is not set +CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018 # CONFIG_MTD_NAND_H1900 is not set # CONFIG_MTD_NAND_GPIO is not set CONFIG_MTD_NAND_IDS=y @@ -950,10 +984,36 @@ CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_VERBOSE_ERROR=y CONFIG_SATA_PMP=y + +# +# Controllers with non-SFF native interface +# +# CONFIG_SATA_AHCI_PLATFORM is not set CONFIG_ATA_SFF=y + +# +# SFF controllers with custom DMA interface +# +CONFIG_ATA_BMDMA=y + +# +# SATA SFF controllers with BMDMA +# # CONFIG_SATA_MV is not set + +# +# PATA SFF controllers with BMDMA +# + +# +# PIO-only SFF controllers +# # CONFIG_PATA_PCMCIA is not set # CONFIG_PATA_PLATFORM is not set + +# +# Generic fallback / legacy drivers +# CONFIG_MD=y # CONFIG_BLK_DEV_MD is not set # CONFIG_BLK_DEV_DM is not set @@ -1061,7 +1121,6 @@ CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m # CONFIG_PPP_MPPE is not set # CONFIG_PPPOE is not set -# CONFIG_PPPOL2TP is not set # CONFIG_SLIP is not set CONFIG_SLHC=m # CONFIG_NETCONSOLE is not set @@ -1083,8 +1142,8 @@ CONFIG_INPUT=y # CONFIG_INPUT_MOUSEDEV=y # CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_MOUSEDEV_SCREEN_X=640 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480 # CONFIG_INPUT_JOYDEV is not set CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set @@ -1097,16 +1156,15 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_ADP5588 is not set # CONFIG_KEYBOARD_ATKBD is not set # CONFIG_QT2160 is not set -# CONFIG_KEYBOARD_CORGI is not set # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=y +# CONFIG_KEYBOARD_TCA6416 is not set CONFIG_KEYBOARD_MATRIX=y # CONFIG_KEYBOARD_LM8323 is not set # CONFIG_KEYBOARD_MAX7359 is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_OPENCORES is not set # CONFIG_KEYBOARD_PXA27x is not set -CONFIG_KEYBOARD_SPITZ=y # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_XTKBD is not set @@ -1119,8 +1177,8 @@ CONFIG_TOUCHSCREEN_ADS7846=y # CONFIG_TOUCHSCREEN_AD7879_I2C is not set # CONFIG_TOUCHSCREEN_AD7879_SPI is not set # CONFIG_TOUCHSCREEN_AD7879 is not set -# CONFIG_TOUCHSCREEN_CORGI is not set # CONFIG_TOUCHSCREEN_DYNAPRO is not set +# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_EETI is not set # CONFIG_TOUCHSCREEN_FUJITSU is not set # CONFIG_TOUCHSCREEN_GUNZE is not set @@ -1138,14 +1196,17 @@ CONFIG_TOUCHSCREEN_ADS7846=y # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set # CONFIG_TOUCHSCREEN_TSC2007 is not set # CONFIG_TOUCHSCREEN_W90X900 is not set +# CONFIG_TOUCHSCREEN_TPS6507X is not set CONFIG_INPUT_MISC=y +# CONFIG_INPUT_AD714X is not set # CONFIG_INPUT_ATI_REMOTE is not set # CONFIG_INPUT_ATI_REMOTE2 is not set # CONFIG_INPUT_KEYSPAN_REMOTE is not set # CONFIG_INPUT_POWERMATE is not set # CONFIG_INPUT_YEALINK is not set # CONFIG_INPUT_CM109 is not set -# CONFIG_INPUT_UINPUT is not set +CONFIG_INPUT_UINPUT=y +# CONFIG_INPUT_PCF8574 is not set # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set # @@ -1164,6 +1225,7 @@ CONFIG_HW_CONSOLE=y # CONFIG_VT_HW_CONSOLE_BINDING is not set CONFIG_DEVKMEM=y # CONFIG_SERIAL_NONSTANDARD is not set +# CONFIG_N_GSM is not set # # Serial drivers @@ -1183,6 +1245,8 @@ CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_TIMBERDALE is not set +# CONFIG_SERIAL_ALTERA_JTAGUART is not set +# CONFIG_SERIAL_ALTERA_UART is not set CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set # CONFIG_LEGACY_PTYS is not set @@ -1200,6 +1264,7 @@ CONFIG_HW_RANDOM=m # CONFIG_IPWIRELESS is not set # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set +# CONFIG_RAMOOPS is not set CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y @@ -1216,6 +1281,7 @@ CONFIG_I2C_HELPER_AUTO=y # CONFIG_I2C_DESIGNWARE is not set # CONFIG_I2C_GPIO is not set # CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PCA_PLATFORM is not set CONFIG_I2C_PXA=y # CONFIG_I2C_PXA_SLAVE is not set # CONFIG_I2C_SIMTEC is not set @@ -1231,7 +1297,6 @@ CONFIG_I2C_PXA=y # # Other I2C/SMBus bus drivers # -# CONFIG_I2C_PCA_PLATFORM is not set # CONFIG_I2C_STUB is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set @@ -1290,11 +1355,16 @@ CONFIG_GPIO_SYSFS=y # # AC97 GPIO expanders: # + +# +# MODULbus GPIO expanders: +# # CONFIG_W1 is not set CONFIG_POWER_SUPPLY=y CONFIG_POWER_SUPPLY_DEBUG=y CONFIG_PDA_POWER=y CONFIG_APM_POWER=y +# CONFIG_TEST_POWER is not set # CONFIG_BATTERY_DS2760 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_BQ27x00 is not set @@ -1353,12 +1423,15 @@ CONFIG_SENSORS_MAX1111=y # CONFIG_SENSORS_PCF8591 is not set # CONFIG_SENSORS_SHT15 is not set # CONFIG_SENSORS_DME1737 is not set +# CONFIG_SENSORS_EMC1403 is not set # CONFIG_SENSORS_SMSC47M1 is not set # CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_ADS7828 is not set +# CONFIG_SENSORS_ADS7871 is not set # CONFIG_SENSORS_AMC6821 is not set # CONFIG_SENSORS_THMC50 is not set +# CONFIG_SENSORS_TMP102 is not set # CONFIG_SENSORS_TMP401 is not set # CONFIG_SENSORS_TMP421 is not set # CONFIG_SENSORS_VT1211 is not set @@ -1380,10 +1453,7 @@ CONFIG_SSB_POSSIBLE=y # Sonics Silicon Backplane # # CONFIG_SSB is not set - -# -# Multifunction device drivers -# +CONFIG_MFD_SUPPORT=y # CONFIG_MFD_CORE is not set # CONFIG_MFD_88PM860X is not set # CONFIG_MFD_SM501 is not set @@ -1393,7 +1463,9 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_HTC_I2CPLD is not set # CONFIG_UCB1400_CORE is not set # CONFIG_TPS65010 is not set +# CONFIG_TPS6507X is not set # CONFIG_TWL4030_CORE is not set +# CONFIG_MFD_TC35892 is not set # CONFIG_MFD_TMIO is not set # CONFIG_MFD_T7L66XB is not set # CONFIG_MFD_TC6387XB is not set @@ -1407,9 +1479,9 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_MFD_WM8994 is not set # CONFIG_MFD_PCF50633 is not set # CONFIG_MFD_MC13783 is not set -# CONFIG_AB3100_CORE is not set +# CONFIG_ABX500_CORE is not set # CONFIG_EZX_PCAP is not set -# CONFIG_AB4500_CORE is not set +# CONFIG_AB8500_CORE is not set # CONFIG_REGULATOR is not set # CONFIG_MEDIA_SUPPORT is not set @@ -1457,12 +1529,13 @@ CONFIG_LCD_CORGI=y # CONFIG_LCD_L4F00242T03 is not set # CONFIG_LCD_LMS283GF05 is not set # CONFIG_LCD_LTV350QV is not set -# CONFIG_LCD_ILI9320 is not set # CONFIG_LCD_TDO24M is not set # CONFIG_LCD_VGG2432A4 is not set # CONFIG_LCD_PLATFORM is not set +# CONFIG_LCD_S6E63M0 is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_GENERIC=y +# CONFIG_BACKLIGHT_ADP8860 is not set # # Display device support @@ -1575,10 +1648,13 @@ CONFIG_USB_MOUSE=m # CONFIG_HID_A4TECH is not set # CONFIG_HID_APPLE is not set # CONFIG_HID_BELKIN is not set +# CONFIG_HID_CANDO is not set # CONFIG_HID_CHERRY is not set # CONFIG_HID_CHICONY is not set +# CONFIG_HID_PRODIKEYS is not set # CONFIG_HID_CYPRESS is not set # CONFIG_HID_DRAGONRISE is not set +# CONFIG_HID_EGALAX is not set # CONFIG_HID_EZKEY is not set # CONFIG_HID_KYE is not set # CONFIG_HID_GYRATION is not set @@ -1593,7 +1669,10 @@ CONFIG_USB_MOUSE=m # CONFIG_HID_ORTEK is not set # CONFIG_HID_PANTHERLORD is not set # CONFIG_HID_PETALYNX is not set +# CONFIG_HID_PICOLCD is not set # CONFIG_HID_QUANTA is not set +# CONFIG_HID_ROCCAT is not set +# CONFIG_HID_ROCCAT_KONE is not set # CONFIG_HID_SAMSUNG is not set # CONFIG_HID_SONY is not set # CONFIG_HID_STANTUM is not set @@ -1604,6 +1683,7 @@ CONFIG_USB_MOUSE=m # CONFIG_HID_THRUSTMASTER is not set # CONFIG_HID_WACOM is not set # CONFIG_HID_ZEROPLUS is not set +# CONFIG_HID_ZYDACRON is not set CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y @@ -1744,6 +1824,7 @@ CONFIG_USB_SERIAL_XIRCOM=m CONFIG_USB_SERIAL_OMNINET=m # CONFIG_USB_SERIAL_OPTICON is not set # CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set +# CONFIG_USB_SERIAL_ZIO is not set # CONFIG_USB_SERIAL_DEBUG is not set # @@ -1799,6 +1880,7 @@ CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y CONFIG_USB_ETH_EEM=y CONFIG_USB_GADGETFS=m +# CONFIG_USB_FUNCTIONFS is not set CONFIG_USB_FILE_STORAGE=m # CONFIG_USB_FILE_STORAGE_TEST is not set CONFIG_USB_MASS_STORAGE=m @@ -1810,6 +1892,8 @@ CONFIG_USB_CDC_COMPOSITE=m CONFIG_USB_G_MULTI=m CONFIG_USB_G_MULTI_RNDIS=y CONFIG_USB_G_MULTI_CDC=y +# CONFIG_USB_G_HID is not set +# CONFIG_USB_G_WEBCAM is not set # # OTG and related infrastructure @@ -1871,10 +1955,6 @@ CONFIG_RTC_LIB=y # CONFIG_DMADEVICES is not set # CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set - -# -# TI VLYNQ -# # CONFIG_STAGING is not set # @@ -2099,6 +2179,7 @@ CONFIG_RING_BUFFER_ALLOW_SWAP=y CONFIG_TRACING_SUPPORT=y # CONFIG_FTRACE is not set # CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_ATOMIC64_SELFTEST is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y CONFIG_ARM_UNWIND=y diff --git a/recipes/linux/linux/use-noclone-attribute-for-naked.patch b/recipes/linux/linux/use-noclone-attribute-for-naked.patch new file mode 100644 index 0000000000..72bf4a1e0a --- /dev/null +++ b/recipes/linux/linux/use-noclone-attribute-for-naked.patch @@ -0,0 +1,53 @@ +https://patchwork.kernel.org/patch/104260/ + +This patch add noinline and noclone attributes to naked functions. +GCC 4.5 has new optimization -fipa-ira which is enabled at -Os and -O2 +this option will clone the functions and that can change the standard +calling convention but the naked functions expect that and use +arguments as in standard calling convention. Therefore the naked +functions should not be marked non inline and noclone. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Index: linux-2.6.34/include/linux/compiler-gcc4.h +=================================================================== +--- linux-2.6.34.orig/include/linux/compiler-gcc4.h 2010-05-29 17:18:55.338127623 -0700 ++++ linux-2.6.34/include/linux/compiler-gcc4.h 2010-05-29 17:32:33.910657021 -0700 +@@ -48,6 +48,10 @@ + * unreleased. Really, we need to have autoconf for the kernel. + */ + #define unreachable() __builtin_unreachable() ++ ++/* Mark a function definition as prohibited from being cloned. */ ++#define __noclone __attribute__((__noclone__)) ++ + #endif + + #endif +Index: linux-2.6.34/include/linux/compiler-gcc.h +=================================================================== +--- linux-2.6.34.orig/include/linux/compiler-gcc.h 2010-05-29 17:28:28.238113095 -0700 ++++ linux-2.6.34/include/linux/compiler-gcc.h 2010-05-29 17:31:58.938153321 -0700 +@@ -58,8 +58,12 @@ + * naked functions because then mcount is called without stack and frame pointer + * being set up and there is no chance to restore the lr register to the value + * before mcount was called. ++ * ++ * The asm() bodies of naked functions often depend on standard calling conventions, ++ * therefore they must be noinline and noclone. GCC 4.[56] currently fail to enforce ++ * this, so we must do so ourselves. See GCC PR44290. + */ +-#define __naked __attribute__((naked)) notrace ++#define __naked __attribute__((naked)) noinline __noclone notrace + + #define __noreturn __attribute__((noreturn)) + +@@ -85,3 +89,8 @@ + #define _gcc_header(x) __gcc_header(linux/compiler-gcc##x.h) + #define gcc_header(x) _gcc_header(x) + #include gcc_header(__GNUC__) ++ ++#if !defined(__noclone) ++#define __noclone /* not needed */ ++#endif ++ diff --git a/recipes/linux/linux_2.6.34.bb b/recipes/linux/linux_2.6.34.bb index 63abbfa636..6c2b4ea26b 100644 --- a/recipes/linux/linux_2.6.34.bb +++ b/recipes/linux/linux_2.6.34.bb @@ -2,6 +2,8 @@ require linux.inc PR = "r1" +module_autoload_ohci-hcd_omap5912osk = "ohci-hcd" + # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_qemuarm = "1" @@ -10,6 +12,7 @@ DEFAULT_PREFERENCE_qemush4 = "1" DEFAULT_PREFERENCE_qemumips = "1" DEFAULT_PREFERENCE_qemux86 = "1" DEFAULT_PREFERENCE_lite5200 = "1" +DEFAULT_PREFERENCE_omap5912osk = "1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/${P}.tar.bz2;name=kernel \ file://ARM-Add-support-for-LZMA-compressed-kernel-images.patch;status=pending \ diff --git a/recipes/linux/linux_git.bb b/recipes/linux/linux_git.bb index c8fedc8f9a..35f827e565 100644 --- a/recipes/linux/linux_git.bb +++ b/recipes/linux/linux_git.bb @@ -1,11 +1,11 @@ require linux.inc -KERNEL_RELEASE = "2.6.34" -SRCREV = "e40152ee1e1c7a63f4777791863215e3faa37a86" +KERNEL_RELEASE = "2.6.35-rc3" +SRCREV = "7e27d6e778cd87b6f2415515d7127eba53fe5d02" PV = "${KERNEL_RELEASE}+gitr${SRCPV}" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;branch=master \ - file://ARM-Add-support-for-LZMA-compressed-kernel-images.patch;status=pending \ + file://use-noclone-attribute-for-naked.patch;status=pending \ file://defconfig" S = "${WORKDIR}/git" diff --git a/recipes/meta/slugos-packages.bb b/recipes/meta/slugos-packages.bb index 53a5598238..20354e999f 100644 --- a/recipes/meta/slugos-packages.bb +++ b/recipes/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r66" +PR = "r67" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2|ixp4xx" @@ -21,7 +21,6 @@ ALLOW_EMPTY = "1" SLUGOS_PACKAGES = "\ alsa-lib \ alsa-utils \ - apex-env \ apr \ asterisk \ asterisk-core-sounds-en-alaw \ @@ -47,8 +46,6 @@ SLUGOS_PACKAGES = "\ bind \ binutils \ bison \ - bluez-hcidump \ - bluez4 \ bogofilter \ bonnie++ \ boost \ @@ -62,7 +59,6 @@ SLUGOS_PACKAGES = "\ coreutils \ cron \ cryptsetup \ - cups \ curl \ cvs \ db \ @@ -93,7 +89,6 @@ SLUGOS_PACKAGES = "\ glib-2.0 \ gnu-config \ gphoto2 \ - gpsd \ grep \ groff \ gtk-doc \ @@ -101,18 +96,15 @@ SLUGOS_PACKAGES = "\ hdparm \ hostap-daemon \ ifupdown \ - inetutils \ iozone3 \ iperf \ ipkg-utils \ iptables \ - ircp \ joe \ jpeg \ kexec-tools \ lcdproc \ less \ - libao \ libdvb \ libexif \ libid3tag \ @@ -134,10 +126,8 @@ SLUGOS_PACKAGES = "\ logrotate \ lrzsz \ lsof \ - lvm2 \ m4 \ madplay \ - madwifi-ng \ mailx \ make \ man man-pages \ @@ -146,11 +136,9 @@ SLUGOS_PACKAGES = "\ mediatomb \ memtester \ mgetty \ - miau \ microcom \ minicom \ monit \ - mpd \ mt-daapd \ mtd-utils \ mutt \ @@ -160,20 +148,14 @@ SLUGOS_PACKAGES = "\ ncftp \ ncurses \ net-tools \ - netatalk \ netcat \ - netpbm \ nfs-utils \ ngrep \ nmap \ ntfs-3g \ ntp \ ntpclient \ - obexftp \ - obexpush \ - openobex-apps \ openntpd \ - openobex \ openssh \ openvpn \ owfs \ @@ -190,12 +172,9 @@ SLUGOS_PACKAGES = "\ puppy \ python \ quilt \ - reiserfsprogs reiser4progs \ rng-tools \ rsync \ - rtorrent \ samba \ - sane-backends \ screen \ sed \ setpwc \ @@ -215,7 +194,6 @@ SLUGOS_PACKAGES = "\ sysfsutils \ syslog-ng \ tar \ - task-mokogateway-everything \ tcpdump \ thttpd \ tiff \ @@ -235,7 +213,6 @@ SLUGOS_PACKAGES = "\ webcam-server \ wget \ wireless-tools \ - wireshark \ wpa-supplicant \ wview-sim \ wview-vpro \ @@ -247,6 +224,46 @@ SLUGOS_PACKAGES = "\ zlib \ " +# Packages that pull in dbus, which pulls in X11 libs. +SLUGOS_DBUS_PACKAGES = "\ + cups \ + gpsd \ + ircp \ + obexftp \ + obexpush \ + openobex-apps \ + openobex \ + rtorrent \ + task-mokogateway-everything \ + " + + +# Packages that pull in X11 libs (impractical packages). +# These are not built by default any more. +SLUGOS_X11_PACKAGES = "\ + bluez-hcidump \ + bluez4 \ + libao \ + mpd \ + netatalk \ + sane-backends \ + wireshark \ + " + +# Packages that are broken but need to be fixed! +# +# - apex-env: gcc4.4 +# - inetutils: gcc 4.4 +# - lvm2: gcc 4.4 (suspected) +# - madwifi-ng: gcc 4.4 (and possibly other problems) +# +SLUGOS_BROKEN_BUT_NEED_FIXING_PACKAGES = "\ + apex-env \ + inetutils \ + lvm2 \ + madwifi-ng \ + " + # Packages currently broken on all platforms # Notes: # ctrlproxy - dependency on tdb.h (part of samba but not packaged/staged). @@ -263,12 +280,15 @@ SLUGOS_BROKEN_PACKAGES = "\ linphone \ lirc-modules lirc \ madfu \ + miau \ motion \ + netpbm \ openldap \ postfix \ pvrusb2-mci \ pwc \ qc-usb-messenger \ + reiserfsprogs reiser4progs \ task-native-sdk \ unionfs-modules unionfs-utils \ wview-sim-mysql wview-wxt510-mysql wview-vpro-mysql \ diff --git a/recipes/netkit-telnet/netkit-telnet_0.17.bb b/recipes/netkit-telnet/netkit-telnet_0.17.bb index 8aceb2e23d..39ac228502 100644 --- a/recipes/netkit-telnet/netkit-telnet_0.17.bb +++ b/recipes/netkit-telnet/netkit-telnet_0.17.bb @@ -8,6 +8,8 @@ SRC_URI = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-${PV file://netkit-telnet-debian_0.17-36.diff \ file://cross-compile.patch " +LDFLAGS_libc-uclibc += " -lncurses" + do_configure () { ./configure --prefix=${prefix} diff --git a/recipes/qi/files/0001-use-rootwait-instead-of-rootdelay.patch b/recipes/qi/files/0001-use-rootwait-instead-of-rootdelay.patch new file mode 100644 index 0000000000..f1f1e64a26 --- /dev/null +++ b/recipes/qi/files/0001-use-rootwait-instead-of-rootdelay.patch @@ -0,0 +1,89 @@ +From 958064eb53b2636ad3c4194707ce789e0d95522b Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Tue, 5 Jan 2010 12:43:46 +0100 +Subject: [PATCH] use rootwait instead of rootdelay + +--- + src/cpu/s3c2410/gta01.c | 6 +++--- + src/cpu/s3c2442/gta02.c | 6 +++--- + src/cpu/s3c6410/om_3d7k-steppingstone.c | 2 +- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/cpu/s3c2410/gta01.c b/src/cpu/s3c2410/gta01.c +index 4686fa2..7ea74db 100644 +--- a/src/cpu/s3c2410/gta01.c ++++ b/src/cpu/s3c2410/gta01.c +@@ -280,7 +280,7 @@ const struct board_api board_api_gta01 = { + .partition_index = 1, + .filesystem = FS_EXT2, + .filepath = "boot/uImage-GTA01.bin", +- .commandline_append = "root=/dev/mmcblk0p1 rootdelay=1 ", ++ .commandline_append = "root=/dev/mmcblk0p1 rootwait ", + }, + [1] = { + .name = "SD Card EXT2 Kernel p2", +@@ -289,7 +289,7 @@ const struct board_api board_api_gta01 = { + .partition_index = 2, + .filesystem = FS_EXT2, + .filepath = "boot/uImage-GTA01.bin", +- .commandline_append = "root=/dev/mmcblk0p2 rootdelay=1 ", ++ .commandline_append = "root=/dev/mmcblk0p2 rootwait ", + }, + [2] = { + .name = "SD Card EXT2 Kernel p3", +@@ -298,7 +298,7 @@ const struct board_api board_api_gta01 = { + .partition_index = 3, + .filesystem = FS_EXT2, + .filepath = "boot/uImage-GTA01.bin", +- .commandline_append = "root=/dev/mmcblk0p3 rootdelay=1 ", ++ .commandline_append = "root=/dev/mmcblk0p3 rootwait ", + }, + [3] = { + .name = "NAND Kernel", +diff --git a/src/cpu/s3c2442/gta02.c b/src/cpu/s3c2442/gta02.c +index 13be2ac..32601f5 100644 +--- a/src/cpu/s3c2442/gta02.c ++++ b/src/cpu/s3c2442/gta02.c +@@ -707,7 +707,7 @@ const struct board_api board_api_gta02 = { + .partition_index = 1, + .filesystem = FS_EXT2, + .filepath = "boot/uImage-GTA02.bin", +- .commandline_append = " root=/dev/mmcblk0p1 rootdelay=1 ", ++ .commandline_append = " root=/dev/mmcblk0p1 rootwait ", + }, + [1] = { + .name = "SD Card EXT2 P2 Kernel", +@@ -716,7 +716,7 @@ const struct board_api board_api_gta02 = { + .partition_index = 2, + .filesystem = FS_EXT2, + .filepath = "boot/uImage-GTA02.bin", +- .commandline_append = " root=/dev/mmcblk0p2 rootdelay=1 ", ++ .commandline_append = " root=/dev/mmcblk0p2 rootwait ", + }, + [2] = { + .name = "SD Card EXT2 P3 Kernel", +@@ -725,7 +725,7 @@ const struct board_api board_api_gta02 = { + .partition_index = 3, + .filesystem = FS_EXT2, + .filepath = "boot/uImage-GTA02.bin", +- .commandline_append = " root=/dev/mmcblk0p3 rootdelay=1 ", ++ .commandline_append = " root=/dev/mmcblk0p3 rootwait ", + }, + [3] = { + .name = "NAND Kernel", +diff --git a/src/cpu/s3c6410/om_3d7k-steppingstone.c b/src/cpu/s3c6410/om_3d7k-steppingstone.c +index 71c57f9..1944e36 100644 +--- a/src/cpu/s3c6410/om_3d7k-steppingstone.c ++++ b/src/cpu/s3c6410/om_3d7k-steppingstone.c +@@ -89,7 +89,7 @@ const struct board_api board_api_om_3d7k = { + "console=ttySAC3,115200 " + "init=/sbin/init " + "loglevel=8 " +- "rootdelay=1 no_console_suspend " ++ "rootwait no_console_suspend " + "ro ", + .commandline_board_debug = " loglevel=8", + .kernel_source = { +-- +1.7.1 + diff --git a/recipes/qi/qi_git.bb b/recipes/qi/qi_git.bb index 6a19292a70..37733a85e8 100644 --- a/recipes/qi/qi_git.bb +++ b/recipes/qi/qi_git.bb @@ -1,11 +1,12 @@ require qi.inc -PR = "r1" +PR = "r2" PR_append = "+gitr${SRCPV}" SRCREV = "c38b062a609f1442e6a9e13005cfbdfd59a5ac0d" SRC_URI = "\ git://git.openmoko.org/git/qi.git;protocol=git;branch=master \ file://sanitize-makefile.patch \ + file://0001-use-rootwait-instead-of-rootdelay.patch \ " S = "${WORKDIR}/git" diff --git a/recipes/swig/swig.inc b/recipes/swig/swig.inc index 30d556c90a..0603d1cfe5 100644 --- a/recipes/swig/swig.inc +++ b/recipes/swig/swig.inc @@ -4,6 +4,8 @@ LICENSE = "BSD" SECTION = "devel" INC_PR = "r1" +DEPENDS = "python" + SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" inherit autotools diff --git a/recipes/swig/swig_1.3.39.bb b/recipes/swig/swig_1.3.39.bb index e82c0c05b1..2db94dae34 100644 --- a/recipes/swig/swig_1.3.39.bb +++ b/recipes/swig/swig_1.3.39.bb @@ -1,8 +1,6 @@ require swig.inc -PR = "${INC_PR}.0" - -DEFAULT_PREFERENCE = "-1" +PR = "${INC_PR}.1" SRC_URI[md5sum] = "ac201d1b87f8659584534f9540d7ad24" SRC_URI[sha256sum] = "bb2d5d9373cf1fe03faaadb02de47af3b058b0300e0f58ece6a7212f0a2b11dc" diff --git a/recipes/swig/swig_2.0.0.bb b/recipes/swig/swig_2.0.0.bb new file mode 100644 index 0000000000..b443def58a --- /dev/null +++ b/recipes/swig/swig_2.0.0.bb @@ -0,0 +1,7 @@ +require swig.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "36ee2d9974be46a9f0a36460af928eb9" +SRC_URI[sha256sum] = "2568d042d3c7cfbcb17e2471b0434bd3aa78d7a1829f9ef6f1b9fc522e4754ea" + diff --git a/recipes/systemd/files/disable_xml_generation.patch b/recipes/systemd/files/disable_xml_generation.patch new file mode 100644 index 0000000000..47f36b8ecb --- /dev/null +++ b/recipes/systemd/files/disable_xml_generation.patch @@ -0,0 +1,36 @@ +Index: git/Makefile.am +=================================================================== +--- git.orig/Makefile.am 2010-06-15 22:58:46.752961117 +0200 ++++ git/Makefile.am 2010-06-15 22:59:22.615040570 +0200 +@@ -75,21 +75,6 @@ + dist_udevrules_DATA = \ + src/99-systemd.rules + +-dbusinterface_DATA = \ +- org.freedesktop.systemd1.Manager.xml \ +- org.freedesktop.systemd1.Job.xml \ +- org.freedesktop.systemd1.Unit.xml \ +- org.freedesktop.systemd1.Service.xml \ +- org.freedesktop.systemd1.Socket.xml \ +- org.freedesktop.systemd1.Timer.xml \ +- org.freedesktop.systemd1.Target.xml \ +- org.freedesktop.systemd1.Device.xml \ +- org.freedesktop.systemd1.Mount.xml \ +- org.freedesktop.systemd1.Automount.xml \ +- org.freedesktop.systemd1.Snapshot.xml \ +- org.freedesktop.systemd1.Swap.xml \ +- org.freedesktop.systemd1.Path.xml +- + dist_systemunit_DATA = \ + units/emergency.service \ + units/basic.target \ +@@ -466,9 +451,6 @@ + man/systemd.special.html.in + endif + +-org.freedesktop.systemd1.%.xml: systemd +- $(AM_V_GEN)./systemd --introspect=${@:.xml=} > $@ +- + CLEANFILES += $(dbusinterface_DATA) + + install-data-hook: diff --git a/recipes/systemd/files/execute.patch b/recipes/systemd/files/execute.patch new file mode 100644 index 0000000000..c9f88c82ea --- /dev/null +++ b/recipes/systemd/files/execute.patch @@ -0,0 +1,17 @@ +Index: git/src/execute.c +=================================================================== +--- git.orig/src/execute.c 2010-06-15 11:41:02.792856752 +0200 ++++ git/src/execute.c 2010-06-15 11:52:02.899046198 +0200 +@@ -47,6 +47,12 @@ + #include "cgroup.h" + #include "namespace.h" + ++#ifndef SCHED_RESET_ON_FORK ++# define SCHED_RESET_ON_FORK 0x40000000 ++#endif ++ ++ ++ + /* This assumes there is a 'tty' group */ + #define TTY_MODE 0620 + diff --git a/recipes/systemd/files/getty-serial@.service b/recipes/systemd/files/getty-serial@.service new file mode 100644 index 0000000000..62e4695243 --- /dev/null +++ b/recipes/systemd/files/getty-serial@.service @@ -0,0 +1,19 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +[Unit] +Description=Getty on %I +Before=getty.target +After=basic.target +Conflicts=shutdown.target + +[Service] +Environment=TERM=linux +ExecStart=/sbin/getty @BAUDRATE@ %I +Restart=restart-always +RestartSec=0 +KillMode=process-group diff --git a/recipes/systemd/files/replace_accpet4.patch b/recipes/systemd/files/replace_accpet4.patch new file mode 100644 index 0000000000..d57b07af65 --- /dev/null +++ b/recipes/systemd/files/replace_accpet4.patch @@ -0,0 +1,26 @@ +Index: git/src/logger.c +=================================================================== +--- git.orig/src/logger.c 2010-06-15 23:02:38.212932153 +0200 ++++ git/src/logger.c 2010-06-15 23:02:51.091686447 +0200 +@@ -331,7 +331,7 @@ + + assert(s); + +- if ((fd = accept4(server_fd, NULL, NULL, SOCK_NONBLOCK|SOCK_CLOEXEC)) < 0) ++ if ((fd = accept(server_fd, NULL, NULL)) < 0) + return -errno; + + if (s->n_streams >= STREAMS_MAX) { +Index: git/src/socket.c +=================================================================== +--- git.orig/src/socket.c 2010-06-15 23:02:16.269606647 +0200 ++++ git/src/socket.c 2010-06-15 23:02:31.115021717 +0200 +@@ -1201,7 +1201,7 @@ + if (w->socket_accept) { + for (;;) { + +- if ((cfd = accept4(fd, NULL, NULL, SOCK_NONBLOCK)) < 0) { ++ if ((cfd = accept(fd, NULL, NULL)) < 0) { + + if (errno == EINTR) + continue; diff --git a/recipes/systemd/files/systemadm.patch b/recipes/systemd/files/systemadm.patch new file mode 100644 index 0000000000..b9c09dbbee --- /dev/null +++ b/recipes/systemd/files/systemadm.patch @@ -0,0 +1,13 @@ +Index: git/src/systemadm.vala +=================================================================== +--- git.orig/src/systemadm.vala 2010-06-15 11:02:35.863509632 +0200 ++++ git/src/systemadm.vala 2010-06-15 11:06:16.305986249 +0200 +@@ -297,7 +297,7 @@ + + bbox.pack_start(cancel_button, false, true, 0); + +- bus = Bus.get(session ? BusType.SESSION : BusType.SYSTEM); ++ bus = DBus.Bus.get(session ? DBus.BusType.SESSION : DBus.BusType.SYSTEM); + + manager = bus.get_object( + "org.freedesktop.systemd1", diff --git a/recipes/systemd/systemd_git.bb b/recipes/systemd/systemd_git.bb new file mode 100644 index 0000000000..5f98e54b1b --- /dev/null +++ b/recipes/systemd/systemd_git.bb @@ -0,0 +1,62 @@ +DESCRIPTION = "Systemd a init replacement" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd" +LICENSE = "GPL" +DEPENDS = "readline udev dbus libcap2 libcgroup gtk+" +PRIORITY = "optional" +SECTION = "base/shell" + +PV = "0.0" +PR_append = "+${SRCPV}" + +inherit autotools vala + +TAG = "1ebdf2d8793181f31b766b8342391aa1978f9917" + +SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git;tag=${TAG} \ + file://execute.patch \ + file://systemadm.patch \ + file://disable_xml_generation.patch \ + file://replace_accpet4.patch \ + file://getty-serial@.service \ + " + +S = "${WORKDIR}/git" + +EXTRA_OECONF = " --with-distro=debian \ + --with-rootdir=${base_prefix} \ + " + +PACKAGES = "${PN} ${PN}-gui ${PN}-dbg ${PN}-doc" + +FILES_${PN}-gui = "${bindir}/systemadm" + +FILES_${PN} = " ${base_bindir}/* \ + ${datadir}/dbus-1/services \ + ${datadir}/dbus-1/system-services \ + ${datadir}/${PN} \ + ${sysconfdir} \ + ${base_libdir}/systemd/* \ + ${base_libdir}/systemd/system/* \ + ${base_libdir}/udev/rules.d \ + /cgroup \ + ${bindir}/systemd-install \ + " + +FILES_${PN}-dbg += " /lib/systemd/.debug " + +def get_baudrate(bb, d): + return bb.data.getVar('SERIAL_CONSOLE', d, 1).split()[0] + + +def get_console(bb, d): + return bb.data.getVar('SERIAL_CONSOLE', d, 1).split()[1] + + +do_install_append(){ + if [ ! ${@get_baudrate(bb, d)} = "" ]; then + sed -i -e s/\@BAUDRATE\@/${@get_baudrate(bb, d)}/g ${WORKDIR}/getty-serial@.service + install ${WORKDIR}/getty-serial@.service ${D}${base_libdir}/systemd/system/ + ln -sf ${base_libdir}/systemd/system/getty-serial@.service \ + ${D}${sysconfdir}/systemd/system/getty.target.wants/getty@${@get_console(bb, d)}.service + fi +} diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb index 6c6120aaf9..4e70afa3a3 100644 --- a/recipes/tasks/task-shr-feed.bb +++ b/recipes/tasks/task-shr-feed.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SHR Feed" -PR = "r57" +PR = "r58" PV = "1.0" LICENSE = "GPL" @@ -21,6 +21,7 @@ RDEPENDS_${PN} += "\ evopedia \ fbreader \ ffalarms \ + foxtrotgps \ gpe-calendar \ gpe-todo \ gpe-scap \ @@ -287,6 +288,7 @@ RDEPENDS_${PN} += "\ neolight \ spojegui \ dbus-daemon-proxy \ + unixbench \ " # this is only usefull on gta02 and on other devices it's trying to pull mesa-dri (not respecting DEFAULT_PROVIDER for virtual/libgl) diff --git a/recipes/udev/udev-154/akita/default b/recipes/udev/udev-154/akita/default new file mode 100644 index 0000000000..d0050b873c --- /dev/null +++ b/recipes/udev/udev-154/akita/default @@ -0,0 +1,4 @@ +# Default for /etc/init.d/udev + +# Comment this out to disable device cache +#DEVCACHE="/etc/dev.tar" diff --git a/recipes/udev/udev-154/bug/10-mx31.rules b/recipes/udev/udev-154/bug/10-mx31.rules new file mode 100644 index 0000000000..de427fc8b2 --- /dev/null +++ b/recipes/udev/udev-154/bug/10-mx31.rules @@ -0,0 +1,49 @@ +KERNEL=="ttyS[0-9]", NAME="tts/%n", SYMLINK+="tts%n" +KERNEL=="ttymxc[0-9]", NAME="ttymxc/%n", SYMLINK+="ttymxc%n" + +KERNEL=="mxc_mu[0-9]", NAME="mxc_mu/%n", SYMLINK+="mxc_mu%n" +KERNEL=="fb*", NAME="fb/%n", SYMLINK+="fb%n" +KERNEL=="i2c*", NAME="i2c/%n" +KERNEL=="mxc_ipc*", NAME="mxc_ipc/%n" +KERNEL=="video*", NAME="v4l/video%n" + +KERNEL=="rtc", NAME="misc/rtc" +KERNEL=="watchdog", NAME="misc/watchdog" + +KERNEL=="mc13783_adc", NAME="mc13783_adc", SYMLINK+="ts" +KERNEL=="pmic_adc", NAME="pmic_adc", SYMLINK+="ts" + +# The long class name gets cut off to be mc13783_connectiv in +# /sys/class/mc13783_connectivity/mc13783_connectivit +KERNEL=="mc13783_connectiv*", NAME="mc13783_connectivity" + +KERNEL=="mxc_ssi[0-9]*", NAME="mxc_ssi/%n", SYMLINK+="mxc_ssi%n" +KERNEL=="spi[0-9]*", NAME="spi/%n", SYMLINK+="spi%n" + +KERNEL=="mtdblock*", NAME="mtdblock/%n" SYMLINK+="mtdblock%n" +KERNEL=="mtd[0-9]", NAME="mtd/%n" + +# A more elegant way of doing this must exist... +KERNEL=="mtd0ro", NAME="mtd/0ro" +KERNEL=="mtd1ro", NAME="mtd/1ro" +KERNEL=="mtd2ro", NAME="mtd/2ro" +KERNEL=="mtd3ro", NAME="mtd/3ro" +KERNEL=="mtd4ro", NAME="mtd/4ro" +KERNEL=="mtd5ro", NAME="mtd/5ro" +KERNEL=="mtd6ro", NAME="mtd/6ro" +KERNEL=="mtd7ro", NAME="mtd/7ro" +KERNEL=="mtd8ro", NAME="mtd/8ro" +KERNEL=="mtd9ro", NAME="mtd/9ro" + +# Note that we want /dev/dsp linked to /dev/sound/dsp1... +KERNEL=="dsp", NAME="sound/dsp" +KERNEL=="dspW", NAME="sound/dspW" +KERNEL=="dsp1", NAME="sound/dsp1", SYMLINK+="dsp" +KERNEL=="mixer", NAME="sound/mixer", SYMLINK+="mixer" +KERNEL=="sequencer", NAME="sound/sequencer" +KERNEL=="sequencer2", NAME="sound/sequencer2" + +KERNEL=="ram[0-9]*", NAME="ram/%n", SYMLINK+="ram%n" + +KERNEL=="dvfs_dptc", NAME="dvfs_dptc", SYMLINK+="dptc dvfs" + diff --git a/recipes/udev/udev-154/bug/30-BUG.rules b/recipes/udev/udev-154/bug/30-BUG.rules new file mode 100644 index 0000000000..06faa6bb91 --- /dev/null +++ b/recipes/udev/udev-154/bug/30-BUG.rules @@ -0,0 +1,26 @@ +## +## BUG/BMI specific +## +KERNEL=="event*", ATTRS{name}=="bugnav", SYMLINK+="input/bugnav" +KERNEL=="event*", ATTRS{name}=="bmi_motion", SYMLINK+="input/bmi_motion" +KERNEL=="event*", ATTRS{name}=="bug_cam", SYMLINK+="input/bmi_cam" +KERNEL=="event*", ATTRS{name}=="bmi_audio_status_m1", SYMLINK+="input/bmi_audio_m1" +KERNEL=="event*", ATTRS{name}=="bmi_audio_status_m2", SYMLINK+="input/bmi_audio_m2" +KERNEL=="event*", ATTRS{name}=="bmi_audio_status_m3", SYMLINK+="input/bmi_audio_m3" +KERNEL=="event*", ATTRS{name}=="bmi_audio_status_m4", SYMLINK+="input/bmi_audio_m4" +DEVPATH=="/devices/platform/bugfb.0", SYMLINK+="bugfb" +KERNEL=="rtc0", SYMLINK+="rtc" +KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts0", SYMLINK+="input/bmi_lcd_ts0" +KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts1", SYMLINK+="input/bmi_lcd_ts1" +KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts2", SYMLINK+="input/bmi_lcd_ts2" +KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts3", SYMLINK+="input/bmi_lcd_ts3" +KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts4", SYMLINK+="input/bmi_lcd_ts4" +KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts5", SYMLINK+="input/bmi_lcd_ts5" +KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts6", SYMLINK+="input/bmi_lcd_ts6" +ACTION=="add", DEVPATH=="/devices/conn*", RUN+="/bin/sh /etc/udev/scripts/bmi_eventpipe.sh" +ACTION=="remove", DEVPATH=="/devices/conn*", RUN+="/bin/sh /etc/udev/scripts/bmi_eventpipe.sh" +# +# For USB PBPSD, which we've arbitrarily decided will be module F001 +# +ACTION=="remove", SUBSYSTEM=="usb", DRIVERS=="psd_driver", ENV{BMIBUS_PRODUCT}="F001", ENV{BMIBUS_SLOT}="%n", RUN+="/bin/sh /etc/udev/scripts/bmi_eventpipe.sh" +ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="psd_driver", ENV{BMIBUS_PRODUCT}="F001", ENV{BMIBUS_SLOT}="%n", RUN+="/bin/sh /etc/udev/scripts/bmi_eventpipe.sh" diff --git a/recipes/udev/udev-154/bug/bmi_eventpipe.sh b/recipes/udev/udev-154/bug/bmi_eventpipe.sh new file mode 100644 index 0000000000..acbae56118 --- /dev/null +++ b/recipes/udev/udev-154/bug/bmi_eventpipe.sh @@ -0,0 +1,8 @@ +#!/bin/sh +# +# This script passes BMI state variables to the running JVM. +# +if [ ${BMIBUS_PRODUCT} != "" ] && [ ${BMIBUS_SLOT} != "" ] && [ ${ACTION} != "" ]; +then + echo $BMIBUS_PRODUCT 0 $BMIBUS_SLOT $ACTION > /tmp/eventpipe +fi diff --git a/recipes/udev/udev-154/c7x0/default b/recipes/udev/udev-154/c7x0/default new file mode 100644 index 0000000000..d0050b873c --- /dev/null +++ b/recipes/udev/udev-154/c7x0/default @@ -0,0 +1,4 @@ +# Default for /etc/init.d/udev + +# Comment this out to disable device cache +#DEVCACHE="/etc/dev.tar" diff --git a/recipes/udev/udev-154/cache b/recipes/udev/udev-154/cache new file mode 100644 index 0000000000..4db1466817 --- /dev/null +++ b/recipes/udev/udev-154/cache @@ -0,0 +1,18 @@ +#!/bin/sh -e + +export TZ=/etc/localtime + +[ -f /etc/default/udev ] && . /etc/default/udev + +echo "Caching udev devnodes" + + if [ "$DEVCACHE" != "" ]; then + echo -n "Populating dev cache" + (cd /; tar cf $DEVCACHE dev) + mv /tmp/uname /etc/udev/saved.uname + mv /tmp/cmdline /etc/udev/saved.cmdline + mv /tmp/atags /etc/udev/saved.atags + echo + fi + +exit 0 diff --git a/recipes/udev/udev-154/default b/recipes/udev/udev-154/default new file mode 100644 index 0000000000..5c4937a9a0 --- /dev/null +++ b/recipes/udev/udev-154/default @@ -0,0 +1,4 @@ +# Default for /etc/init.d/udev + +# Comment this out to disable device cache +DEVCACHE="/etc/dev.tar" diff --git a/recipes/udev/udev-154/init b/recipes/udev/udev-154/init new file mode 100644 index 0000000000..f4dc5de2f5 --- /dev/null +++ b/recipes/udev/udev-154/init @@ -0,0 +1,78 @@ +#!/bin/sh -e + +### BEGIN INIT INFO +# Provides: udev +# Required-Start: mountvirtfs +# Required-Stop: +# Default-Start: S +# Default-Stop: +# Short-Description: Start udevd, populate /dev and load drivers. +### END INIT INFO + +export TZ=/etc/localtime + +[ -d /sys/class ] || exit 1 +[ -r /proc/mounts ] || exit 1 +[ -x /sbin/udevd ] || exit 1 +[ -f /etc/default/udev ] && . /etc/default/udev +[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf + +kill_udevd() { + if [ -x /sbin/pidof ]; then + pid=`/sbin/pidof -x udevd` + [ -n "$pid" ] && kill $pid + fi +} + +export ACTION=add +# propagate /dev from /sys +echo "Starting udev" + +# mount the tmpfs on /dev, if not already done +LANG=C awk "\$2 == \"/dev\" && \$4 == \"tmpfs\" { exit 1 }" /proc/mounts && { + mount -n -o mode=0755 -t tmpfs none "/dev" + mkdir -m 0755 /dev/pts + mkdir -m 1777 /dev/shm +} + +if [ "$DEVCACHE" != "" ]; then + # Invalidate udev cache if the kernel or its bootargs/cmdline have changed + [ -x /bin/uname ] && /bin/uname -mrspv > /tmp/uname || touch /tmp/uname + [ -r /proc/cmdline ] && cat /proc/cmdline > /tmp/cmdline || touch /tmp/cmdline + [ -r /proc/atags ] && cat /proc/atags > /tmp/atags || touch /tmp/atags + if [ -e $DEVCACHE ] && \ + cmp -s /tmp/uname /etc/udev/saved.uname && \ + cmp -s /tmp/cmdline /etc/udev/saved.cmdline && \ + cmp -s /tmp/atags /etc/udev/saved.atags; then + (cd /; tar xf $DEVCACHE > /dev/null 2>&1) + not_first_boot=1 + fi +fi + +if [ ! -e "/lib/modules/$(uname -r)"/modules.dep ] ; then + mkdir -p /lib/modules/$(uname -r) + depmod -ae +fi + +# make_extra_nodes +kill_udevd > "/dev/null" 2>&1 + + # trigger the sorted events + echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug + /sbin/udevd -d + + /sbin/udevadm control --env STARTUP=1 + if [ "$not_first_boot" != "" ];then + /sbin/udevadm trigger --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform + (/sbin/udevadm settle --timeout=3; /sbin/udevadm control --env STARTUP=)& + if [ "$DEVCACHE" != "" ]; then + rm -f /tmp/uname + rm -f /tmp/cmdline + rm -f /tmp/atags + fi + else + /sbin/udevadm trigger + /sbin/udevadm settle + fi + +exit 0 diff --git a/recipes/udev/udev-154/local.rules b/recipes/udev/udev-154/local.rules new file mode 100644 index 0000000000..da4b38593c --- /dev/null +++ b/recipes/udev/udev-154/local.rules @@ -0,0 +1,35 @@ +# There are a number of modifiers that are allowed to be used in some +# of the different fields. They provide the following subsitutions: +# +# %n the "kernel number" of the device. +# For example, 'sda3' has a "kernel number" of '3' +# %e the smallest number for that name which does not matches an existing node +# %k the kernel name for the device +# %M the kernel major number for the device +# %m the kernel minor number for the device +# %b the bus id for the device +# %c the string returned by the PROGRAM +# %s{filename} the content of a sysfs attribute +# %% the '%' char itself +# + +# Media automounting +SUBSYSTEM=="block", ACTION=="add" RUN+="/etc/udev/scripts/mount.sh" +SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh" + +# Handle network interface setup +SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh" +SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh" + +# The first rtc device is symlinked to /dev/rtc +KERNEL=="rtc0", SYMLINK+="rtc" + +#The first framebuffer is symlinked to /dev/fb +KERNEL=="fb0", SYMLINK+="fb" + +# Try and modprobe for drivers for new hardware +ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}" + +# Create a symlink to any touchscreen input device +SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0" +SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{modalias}=="ads7846", SYMLINK+="input/touchscreen0" diff --git a/recipes/udev/udev-154/omap3-pandora/local.rules b/recipes/udev/udev-154/omap3-pandora/local.rules new file mode 100644 index 0000000000..e433cf9593 --- /dev/null +++ b/recipes/udev/udev-154/omap3-pandora/local.rules @@ -0,0 +1,40 @@ +# There are a number of modifiers that are allowed to be used in some +# of the different fields. They provide the following subsitutions: +# +# %n the "kernel number" of the device. +# For example, 'sda3' has a "kernel number" of '3' +# %e the smallest number for that name which does not matches an existing node +# %k the kernel name for the device +# %M the kernel major number for the device +# %m the kernel minor number for the device +# %b the bus id for the device +# %c the string returned by the PROGRAM +# %s{filename} the content of a sysfs attribute +# %% the '%' char itself +# + +# Media automounting +SUBSYSTEM=="block", ACTION=="add" RUN+="/etc/udev/scripts/mount.sh" +SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh" + +# Handle network interface setup +SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh" +SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh" + +# The first rtc device is symlinked to /dev/rtc +KERNEL=="rtc0", SYMLINK+="rtc" + +#The first framebuffer is symlinked to /dev/fb +KERNEL=="fb0", SYMLINK+="fb" + +# Try and modprobe for drivers for new hardware +ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}" + +# Create a symlink to any touchscreen input device +SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0" +SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="ads7846", SYMLINK+="input/touchscreen0" + +# Local UDEV rule changes for the Pandora system. + +# Let all users access the event devices using EVDEV (the OpenPandora is not multiuser after all). +KERNEL=="event[0-9]",MODE="0666"
\ No newline at end of file diff --git a/recipes/udev/udev-154/permissions.rules b/recipes/udev/udev-154/permissions.rules new file mode 100644 index 0000000000..940d163047 --- /dev/null +++ b/recipes/udev/udev-154/permissions.rules @@ -0,0 +1,119 @@ +ACTION!="add", GOTO="permissions_end" + +# workarounds needed to synchronize with sysfs +# only needed for kernels < v2.6.18-rc1 +ENV{PHYSDEVPATH}!="?*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus" +SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", WAIT_FOR_SYSFS="ioerr_cnt" +# only needed for kernels < 2.6.16 +SUBSYSTEM=="net", WAIT_FOR_SYSFS="address" +# only needed for kernels < 2.6.17 +SUBSYSTEM=="net", ENV{DRIVER}=="?*", WAIT_FOR_SYSFS="device/driver" + +# devices needed to load the drivers providing them +KERNEL=="tun", OPTIONS+="ignore_remove" +KERNEL=="ppp", OPTIONS+="ignore_remove" +KERNEL=="loop[0-9]*", OPTIONS+="ignore_remove" + +# default permissions for block devices +SUBSYSTEM=="block", GROUP="disk" +# the aacraid driver is broken and reports that disks removable (see #404927) +SUBSYSTEM=="block", ATTRS{removable}=="1", \ + DRIVERS!="aacraid", GROUP="floppy" +# all block devices on these buses are "removable" +SUBSYSTEM=="block", SUBSYSTEMS=="usb|ieee1394|mmc|pcmcia", GROUP="floppy" + +# IDE devices +KERNEL=="hd[a-z]|pcd[0-9]*", DRIVERS=="ide-cdrom|pcd", \ + IMPORT{program}="cdrom_id --export $tempnode" +ENV{ID_CDROM}=="?*", GROUP="cdrom" +KERNEL=="ht[0-9]*", GROUP="tape" +KERNEL=="nht[0-9]*", GROUP="tape" + +# SCSI devices +KERNEL=="sr[0-9]*", IMPORT{program}="cdrom_id --export $tempnode" +SUBSYSTEMS=="scsi", ATTRS{type}=="1", GROUP="tape" +SUBSYSTEMS=="scsi", ATTRS{type}=="4", GROUP="cdrom" +SUBSYSTEMS=="scsi", ATTRS{type}=="5", GROUP="cdrom" +SUBSYSTEMS=="scsi", ATTRS{type}=="8", GROUP="tape" + +# USB devices +KERNEL=="legousbtower*", MODE="0666" +KERNEL=="lp[0-9]*", SUBSYSTEMS=="usb", GROUP="lp" + +# usbfs-like devices +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", \ + MODE="0664" + +# iRiver music players +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="plugdev", \ + ATTRS{idVendor}=="4102", ATTRS{idProduct}=="10[01][135789]" + +# serial devices +SUBSYSTEM=="tty", GROUP="dialout" +SUBSYSTEM=="capi", GROUP="dialout" +SUBSYSTEM=="slamr", GROUP="dialout" +SUBSYSTEM=="zaptel", GROUP="dialout" + +# vc devices (all members of the tty subsystem) +KERNEL=="ptmx", MODE="0666", GROUP="root" +KERNEL=="console", MODE="0600", GROUP="root" +KERNEL=="tty", MODE="0666", GROUP="root" +KERNEL=="tty[0-9]*", GROUP="root" +KERNEL=="pty*", MODE="0666", GROUP="tty" + +# video devices +SUBSYSTEM=="video4linux", GROUP="video" +SUBSYSTEM=="drm", GROUP="video" +SUBSYSTEM=="dvb", GROUP="video" +SUBSYSTEM=="em8300", GROUP="video" +SUBSYSTEM=="graphics", GROUP="video" +SUBSYSTEM=="nvidia", GROUP="video" + +# misc devices +KERNEL=="random", MODE="0666" +KERNEL=="urandom", MODE="0666" +KERNEL=="mem", MODE="0640", GROUP="kmem" +KERNEL=="kmem", MODE="0640", GROUP="kmem" +KERNEL=="port", MODE="0640", GROUP="kmem" +KERNEL=="full", MODE="0666" +KERNEL=="null", MODE="0666" +KERNEL=="zero", MODE="0666" +KERNEL=="inotify", MODE="0666" +KERNEL=="sgi_fetchop", MODE="0666" +KERNEL=="sonypi", MODE="0666" +KERNEL=="agpgart", GROUP="video" +KERNEL=="rtc|rtc[0-9]*", GROUP="audio" +KERNEL=="kqemu", MODE="0666" +KERNEL=="tun", MODE="0666", + +KERNEL=="cdemu[0-9]*", GROUP="cdrom" +KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" +KERNEL=="pktcdvd", MODE="0644" + +# printers and parallel devices +SUBSYSTEM=="printer", GROUP="lp" +SUBSYSTEM=="ppdev", GROUP="lp" +KERNEL=="irlpt*", GROUP="lp" +KERNEL=="pt[0-9]*", GROUP="tape" +KERNEL=="pht[0-9]*", GROUP="tape" + +# sound devices +SUBSYSTEM=="sound", GROUP="audio" + +# ieee1394 devices +KERNEL=="raw1394", GROUP="disk" +KERNEL=="dv1394*", GROUP="video" +KERNEL=="video1394*", GROUP="video" + +# input devices +KERNEL=="event[0-9]*", ATTRS{name}=="*dvb*|*DVB*|* IR *" \ + MODE="0664", GROUP="video" +KERNEL=="js[0-9]*", MODE="0664" +KERNEL=="lirc[0-9]*", GROUP="video" + +# AOE character devices +SUBSYSTEM=="aoe", MODE="0220", GROUP="disk" +SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440" + +LABEL="permissions_end" + diff --git a/recipes/udev/udev-154/run.rules b/recipes/udev/udev-154/run.rules new file mode 100644 index 0000000000..75d71375bb --- /dev/null +++ b/recipes/udev/udev-154/run.rules @@ -0,0 +1,14 @@ +# debugging monitor +RUN+="socket:/org/kernel/udev/monitor" + +# run a command on remove events +ACTION=="remove", ENV{REMOVE_CMD}!="", RUN+="$env{REMOVE_CMD}" + +# ignore the events generated by virtual consoles +KERNEL=="ptmx", OPTIONS+="last_rule" +KERNEL=="console", OPTIONS+="last_rule" +KERNEL=="tty" , OPTIONS+="last_rule" +KERNEL=="tty[0-9]*", OPTIONS+="last_rule" +KERNEL=="pty*", OPTIONS+="last_rule" +SUBSYSTEM=="vc", OPTIONS+="last_rule" + diff --git a/recipes/udev/udev-154/spitz/default b/recipes/udev/udev-154/spitz/default new file mode 100644 index 0000000000..d0050b873c --- /dev/null +++ b/recipes/udev/udev-154/spitz/default @@ -0,0 +1,4 @@ +# Default for /etc/init.d/udev + +# Comment this out to disable device cache +#DEVCACHE="/etc/dev.tar" diff --git a/recipes/udev/udev-154/tosa/default b/recipes/udev/udev-154/tosa/default new file mode 100644 index 0000000000..d0050b873c --- /dev/null +++ b/recipes/udev/udev-154/tosa/default @@ -0,0 +1,4 @@ +# Default for /etc/init.d/udev + +# Comment this out to disable device cache +#DEVCACHE="/etc/dev.tar" diff --git a/recipes/udev/udev-154/udev-replace-le16toh.patch b/recipes/udev/udev-154/udev-replace-le16toh.patch new file mode 100644 index 0000000000..7776c9a10e --- /dev/null +++ b/recipes/udev/udev-154/udev-replace-le16toh.patch @@ -0,0 +1,21 @@ +This patch is needed on uclibc. + +-Khem + +Index: udev-151/extras/ata_id/ata_id.c +=================================================================== +--- udev-151.orig/extras/ata_id/ata_id.c 2010-06-04 14:08:41.912730501 -0700 ++++ udev-151/extras/ata_id/ata_id.c 2010-06-04 14:09:31.492734527 -0700 +@@ -168,7 +168,11 @@ static void disk_identify_fixup_uint16 ( + uint16_t *p; + + p = (uint16_t *) identify; +- p[offset_words] = le16toh (p[offset_words]); ++#if __BYTE_ORDER == __LITTLE_ENDIAN ++ p[offset_words] = p[offset_words]; ++#else ++ p[offset_words] = __bswap_16 (p[offset_words]); ++#endif + } + + /** diff --git a/recipes/udev/udev-154/udev-replace-lutimes.patch b/recipes/udev/udev-154/udev-replace-lutimes.patch new file mode 100644 index 0000000000..dd77897345 --- /dev/null +++ b/recipes/udev/udev-154/udev-replace-lutimes.patch @@ -0,0 +1,25 @@ +This patch is needed on uclibc + +-Khem +Index: udev-151/udev/udev-node.c +=================================================================== +--- udev-151.orig/udev/udev-node.c 2010-06-04 14:18:59.082727182 -0700 ++++ udev-151/udev/udev-node.c 2010-06-04 14:20:27.485282812 -0700 +@@ -57,7 +57,7 @@ int udev_node_mknod(struct udev_device * + preserve = 1; + udev_selinux_lsetfilecon(udev, file, mode); + /* update time stamp when we re-use the node, like on media change events */ +- utimes(file, NULL); ++ utimensat(AT_FDCWD, file, NULL, 0); + } else { + char file_tmp[UTIL_PATH_SIZE + sizeof(TMP_FILE_EXT)]; + +@@ -178,7 +178,7 @@ static int node_symlink(struct udev *ude + info(udev, "preserve already existing symlink '%s' to '%s'\n", + slink, target); + udev_selinux_lsetfilecon(udev, slink, S_IFLNK); +- lutimes(slink, NULL); ++ utimensat(AT_FDCWD, slink, NULL, AT_SYMLINK_NOFOLLOW); + goto exit; + } + } diff --git a/recipes/udev/udev-154/udev.rules b/recipes/udev/udev-154/udev.rules new file mode 100644 index 0000000000..60288c06ed --- /dev/null +++ b/recipes/udev/udev-154/udev.rules @@ -0,0 +1,116 @@ +# There are a number of modifiers that are allowed to be used in some +# of the different fields. They provide the following subsitutions: +# +# %n the "kernel number" of the device. +# For example, 'sda3' has a "kernel number" of '3' +# %e the smallest number for that name which does not matches an existing node +# %k the kernel name for the device +# %M the kernel major number for the device +# %m the kernel minor number for the device +# %b the bus id for the device +# %c the string returned by the PROGRAM +# %s{filename} the content of a sysfs attribute +# %% the '%' char itself +# + +# workaround for devices which do not report media changes +SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", \ + ENV{ID_MODEL}=="IOMEGA_ZIP*", OPTIONS+="all_partitions" +SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTRS{media}=="floppy", \ + OPTIONS+="all_partitions" + +# SCSI devices +SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", NAME="scd%n", SYMLINK+="sr%n" + +# USB devices +SUBSYSTEMS=="usb", KERNEL=="auer[0-9]*", NAME="usb/%k" +SUBSYSTEMS=="usb", KERNEL=="cpad[0-9]*", NAME="usb/%k" +SUBSYSTEMS=="usb", KERNEL=="dabusb*", NAME="usb/%k" +SUBSYSTEMS=="usb", KERNEL=="hiddev*", NAME="usb/%k" +SUBSYSTEMS=="usb", KERNEL=="legousbtower*", NAME="usb/%k" +SUBSYSTEMS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k" +SUBSYSTEMS=="usb", KERNEL=="ttyUSB*", \ + ATTRS{product}=="Palm Handheld*|Handspring Visor|palmOne Handheld", \ + SYMLINK+="pilot" + +# usbfs-like devices +SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", ACTION=="add", \ + NAME="%c" +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}" + +# serial devices +KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20" +KERNEL=="capi[0-9]*", NAME="capi/%n" + +# video devices +KERNEL=="dvb*", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}", ACTION=="add", \ + NAME="%c" +KERNEL=="card[0-9]*", NAME="dri/%k" + +# misc devices +KERNEL=="hw_random", NAME="hwrng" +KERNEL=="tun", NAME="net/%k" +KERNEL=="evtchn", NAME="xen/%k" + +KERNEL=="cdemu[0-9]*", NAME="cdemu/%n" +KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%n" +KERNEL=="pktcdvd", NAME="pktcdvd/control" + +KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid" +KERNEL=="msr[0-9]*", NAME="cpu/%n/msr" +KERNEL=="microcode", NAME="cpu/microcode" + +KERNEL=="umad*", NAME="infiniband/%k" +KERNEL=="issm*", NAME="infiniband/%k" +KERNEL=="uverbs*", NAME="infiniband/%k" +KERNEL=="ucm*", NAME="infiniband/%k" +KERNEL=="rdma_ucm", NAME="infiniband/%k" + +# ALSA devices +KERNEL=="controlC[0-9]*", NAME="snd/%k" +KERNEL=="hwC[D0-9]*", NAME="snd/%k" +KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k" +KERNEL=="midiC[D0-9]*", NAME="snd/%k" +KERNEL=="timer", NAME="snd/%k" +KERNEL=="seq", NAME="snd/%k" + +# ieee1394 devices +KERNEL=="dv1394*", NAME="dv1394/%n" +KERNEL=="video1394*", NAME="video1394/%n" + +# input devices +KERNEL=="mice", NAME="input/%k" +KERNEL=="mouse[0-9]*", NAME="input/%k" +KERNEL=="event[0-9]*", NAME="input/%k" +KERNEL=="js[0-9]*", NAME="input/%k" +KERNEL=="ts[0-9]*", NAME="input/%k" +KERNEL=="uinput", NAME="input/%k" + +# Zaptel +KERNEL=="zapctl", NAME="zap/ctl" +KERNEL=="zaptimer", NAME="zap/timer" +KERNEL=="zapchannel", NAME="zap/channel" +KERNEL=="zappseudo", NAME="zap/pseudo" +KERNEL=="zap[0-9]*", NAME="zap/%n" + +# AOE character devices +SUBSYSTEM=="aoe", KERNEL=="discover", NAME="etherd/%k" +SUBSYSTEM=="aoe", KERNEL=="err", NAME="etherd/%k" +SUBSYSTEM=="aoe", KERNEL=="interfaces", NAME="etherd/%k" +SUBSYSTEM=="aoe", KERNEL=="revalidate", NAME="etherd/%k" + +# device mapper creates its own device nodes, so ignore these +KERNEL=="dm-[0-9]*", OPTIONS+="ignore_device" +KERNEL=="device-mapper", NAME="mapper/control" + +KERNEL=="rfcomm[0-9]*", GROUP="users", MODE="0660" + +# Firmware Helper +ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware.sh" + +# Samsung UARTS +KERNEL=="s3c2410_serial[0-9]", NAME="ttySAC%n" + +# MXC UARTs +KERNEL=="ttymxc[0-4]", NAME="ttymxc%n" + diff --git a/recipes/udev/udev_154.bb b/recipes/udev/udev_154.bb new file mode 100644 index 0000000000..cd370e801b --- /dev/null +++ b/recipes/udev/udev_154.bb @@ -0,0 +1,125 @@ +DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \ +/dev/, handles hotplug events and loads drivers at boot time. It replaces \ +the hotplug package and requires a kernel not older than 2.6.12." +LICENSE = "GPLv2+" + +PR = "r0" + +# Untested +DEFAULT_PREFERENCE = "-1" + +# Needed for udev-extras +DEPENDS = "gperf-native usbutils acl glib-2.0" +RDEPENDS_${PN} += "module-init-tools-depmod udev-utils" + +SRC_URI[md5sum] = "4ee3bcc4e326e967167ccb6a6ba04514" +SRC_URI[sha256sum] = "29d66a5a8499cc6e4f2bcc7f79f2c6b44f4d720cecef2e552f0354d792e40a83" + +SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ + file://mount.blacklist \ + file://run.rules \ + " +SRC_URI += " \ + file://udev.rules \ + file://devfs-udev.rules \ + file://links.conf \ + file://permissions.rules \ + file://mount.sh \ + file://network.sh \ + file://local.rules \ + file://default \ + file://init \ + file://cache \ +" + +SRC_URI_append_h2200 = " file://50-hostap_cs.rules " +PACKAGE_ARCH_h2200 = "h2200" + +#buglabs's bug device +SRC_URI_append_bug = " \ + file://30-BUG.rules \ + file://10-mx31.rules \ + file://bmi_eventpipe.sh " + +PACKAGE_ARCH_bug = "bug" + +inherit update-rc.d autotools + +EXTRA_OECONF += " --with-udev-prefix= \ + --with-libdir-name=${base_libdir} \ + --disable-introspection \ + ac_cv_file__usr_share_pci_ids=yes \ + ac_cv_file__usr_share_hwdata_pci_ids=no \ + ac_cv_file__usr_share_misc_pci_ids=no \ + --sbindir=${base_sbindir} \ + --libexecdir=${base_libdir}/udev \ + --with-rootlibdir=${base_libdir} \ +" + +INITSCRIPT_NAME = "udev" +INITSCRIPT_PARAMS = "start 03 S ." + +PACKAGES =+ "libudev libgudev udev-utils" + +FILES_libudev = "${libdir}/libudev.so.*" +FILES_libgudev = "${libdir}/libgudev*.so.*" + +FILES_udev-utils = "${bindir}/udevinfo ${bindir}/udevtest ${base_sbindir}/udevadm" + +RPROVIDES_${PN} = "hotplug" +FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd" +FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug" + +# udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir} +# is ${prefix}/lib64 +FILES_${PN} += "/lib/udev* ${libdir}/ConsoleKit" +FILES_${PN}-dbg += "/lib/udev/.debug" + +do_install () { + install -d ${D}${usrsbindir} \ + ${D}${sbindir} + oe_runmake 'DESTDIR=${D}' INSTALL=install install + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev + install -m 0755 ${WORKDIR}/cache ${D}${sysconfdir}/init.d/udev-cache + + install -d ${D}${sysconfdir}/default + install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/udev + + cp ${S}/rules/rules.d/* ${D}${sysconfdir}/udev/rules.d/ + cp ${S}/rules/packages/* ${D}${sysconfdir}/udev/rules.d/ + + install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/ + install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules + install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules + install -m 0644 ${WORKDIR}/run.rules ${D}${sysconfdir}/udev/rules.d/run.rules + install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules + install -m 0644 ${WORKDIR}/links.conf ${D}${sysconfdir}/udev/links.conf + if [ "${UDEV_DEVFS_RULES}" = "1" ]; then + install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules + fi + + touch ${D}${sysconfdir}/udev/saved.uname + touch ${D}${sysconfdir}/udev/saved.cmdline + touch ${D}${sysconfdir}/udev/saved.atags + + install -d ${D}${sysconfdir}/udev/scripts/ + + install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh + install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts +} + +do_install_append_h2200() { + install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules +} + +do_install_append_bug() { + install -m 0644 ${WORKDIR}/30-BUG.rules ${D}${sysconfdir}/udev/rules.d/30-BUG.rules + install -m 0644 ${WORKDIR}/10-mx31.rules ${D}${sysconfdir}/udev/rules.d/10-mx31.rules + install -m 0644 ${WORKDIR}/bmi_eventpipe.sh ${D}${sysconfdir}/udev/scripts/bmi_eventpipe.sh +} + +# Create the cache after checkroot has run +pkg_postinst_${PN}_append() { + update-rc.d $OPT udev-cache start 12 S . +} diff --git a/recipes/unixbench/unixbench_5.1.2.bb b/recipes/unixbench/unixbench_5.1.2.bb new file mode 100644 index 0000000000..494e6593ce --- /dev/null +++ b/recipes/unixbench/unixbench_5.1.2.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Unix benchmark suite" +DEPENDS = "virtual/libgl" +RRECOMMENDS_${PN} = "x11perf perl perl-module-strict perl-module-posix perl-module-time-hires perl-module-exporter-heavy perl-module-io-handle perl-module-io" +PR = "r1" + +SRC_URI = "http://byte-unixbench.googlecode.com/files/${P}.tar.gz" + +EXTRA_OEMAKE = "-j1 'CC=${CC}' 'CFLAGS=-DTIME -Wall -pedantic -ansi ${CFLAGS} ${LDFLAGS}'" + +FILES_${PN} = "${prefix}/src/unixbench-${PV}" +FILES_${PN}-dbg = "${prefix}/src/unixbench-${PV}/pgms/.debug" + +do_install () { + install -d ${D}${prefix}/src + cp -pPR ${S} ${D}${prefix}/src/ +} + +SRC_URI[md5sum] = "10edef9af6ad29770437d0b39828218d" +SRC_URI[sha256sum] = "1172d9c7777e67e477b421856b70406ba18a497480db27e4d79eb104435f8d90" diff --git a/recipes/webm/libvpx.inc b/recipes/webm/libvpx.inc new file mode 100644 index 0000000000..a0aebffc17 --- /dev/null +++ b/recipes/webm/libvpx.inc @@ -0,0 +1,30 @@ +DESCRIPTION = "vpx Multi-Format Codec SDK" +LICENSE = "BSD" + +PR = "r1" + +SRC_URI = "http://webm.googlecode.com/files/libvpx-${PV}.tar.bz2" + +inherit autotools + +CFLAGS += "-fPIC" + +export CC +export LD = "${CC}" + +VPXTARGET_armv5te = "armv5te-linux-gcc" +VPXTARGET_armv6 = "armv6-linux-gcc" +VPXTARGET_armv7a = "armv7-linux-gcc" +VPXTARGET ?= "generic-gnu" + +CONFIGUREOPTS = " \ + --target=${VPXTARGET} \ + --enable-vp8 \ + --enable-libs \ + --disable-install-docs \ +" + +do_install() { + oe_runmake install DESTDIR=${D} +} + diff --git a/recipes/webm/libvpx_0.9.0.bb b/recipes/webm/libvpx_0.9.0.bb index 0e7545fa0a..8992c04b8a 100644 --- a/recipes/webm/libvpx_0.9.0.bb +++ b/recipes/webm/libvpx_0.9.0.bb @@ -1,35 +1,17 @@ -DESCRIPTION = "vpx Multi-Format Codec SDK" +require libvpx.inc + LICENSE = "VP8" PR = "r3" -SRC_URI = "http://webm.googlecode.com/files/libvpx-${PV}.tar.bz2" - SRC_URI[md5sum] = "9eb8e818d2f3263623c258fe66924082" SRC_URI[sha256sum] = "a0096ac6859cfb61cf06dd9bc0a79a3333a4ec389ba311911d84df8ff2a1b9dc" -inherit autotools - -export CC -export LD = "${CC}" - -VPXTARGET_armv5te = "armv5te-linux-gcc" -VPXTARGET_armv6 = "armv6-linux-gcc" -VPXTARGET_armv7a = "armv7-linux-gcc" -VPXTARGET ?= "generic-gnu" - -CONFIGUREOPTS = " \ - --target=${VPXTARGET} \ - --enable-vp8 \ - --enable-libs \ - --disable-install-docs \ -" - do_install() { - oe_runmake install - install -d ${D}${prefix} - cp -r ${S}/vpx-vp8-nopost-nodocs*${PV}/* ${D}${prefix}/ - install -d ${D}${includedir}/vpx - mv ${D}${includedir}/*.h ${D}${includedir}/vpx + oe_runmake install + install -d ${D}${prefix} + cp -r ${S}/vpx-vp8-nopost-nodocs*${PV}/* ${D}${prefix}/ + install -d ${D}${includedir}/vpx + mv ${D}${includedir}/*.h ${D}${includedir}/vpx } diff --git a/recipes/webm/libvpx_0.9.1.bb b/recipes/webm/libvpx_0.9.1.bb new file mode 100644 index 0000000000..b5471b8257 --- /dev/null +++ b/recipes/webm/libvpx_0.9.1.bb @@ -0,0 +1,5 @@ +require libvpx.inc + +SRC_URI[md5sum] = "e1442e74d0cca228785083fa520735a2" +SRC_URI[sha256sum] = "c4e8e463e079ffde5b6948366a1d0873f1bf685dccd89ca137585c2b8247ec59" + diff --git a/recipes/xbmc/libmicrohttpd_0.4.6.bb b/recipes/xbmc/libmicrohttpd_0.4.6.bb index 12f581af71..d46448ec3a 100644 --- a/recipes/xbmc/libmicrohttpd_0.4.6.bb +++ b/recipes/xbmc/libmicrohttpd_0.4.6.bb @@ -5,7 +5,7 @@ SRC_URI = "ftp://ftp.nluug.nl/pub/gnu/libmicrohttpd//libmicrohttpd-${PV}.tar.gz" SRC_URI[md5sum] = "61698da6aa04744ea076c327f66fc05a" SRC_URI[sha256sum] = "0cb09e26678d1531a4fd40a748abff5142bfdad3ae11cfe3bb7ad7317a99e371" -DEPENDS = "libgrypt curl" +DEPENDS = "libgcrypt curl" inherit autotools lib_package diff --git a/recipes/xfce-base/exo_0.3.107.bb b/recipes/xfce-base/exo_0.3.107.bb new file mode 100644 index 0000000000..41c2a58922 --- /dev/null +++ b/recipes/xfce-base/exo_0.3.107.bb @@ -0,0 +1,28 @@ +DESCRIPTION="Xfce extensions and framework library with session management support" +DEPENDS = "libxfce4util hal liburi-perl-native python-native cairo" +SECTION = "x11" +PR = "r1" + +inherit xfce46 python-dir + +XFCE_VERSION = "4.6.2" + +SRC_URI += " \ + file://exo-no-tests.patch \ + file://configure.patch \ +" + +# Note: Python checking is broken +do_configure_prepend() { + sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.in +} + +FILES_${PN} += "${datadir}/xfce4/ \ + ${PYTHON_SITEPACKAGES_DIR}/* \ + ${prefix}/share/pygtk/2.0/defs/exo-0.3/exo.defs \ +" + +FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug/*" + +SRC_URI[md5sum] = "3a92cca0c99ee940db4410891c9e8498" +SRC_URI[sha256sum] = "0a12ac124bad67c8de7135f7052641239ed640884a71612930f99c425bede2a3" diff --git a/recipes/xfce-base/libxfce4menu_4.6.2.bb b/recipes/xfce-base/libxfce4menu_4.6.2.bb new file mode 100644 index 0000000000..663944a954 --- /dev/null +++ b/recipes/xfce-base/libxfce4menu_4.6.2.bb @@ -0,0 +1,12 @@ +DESCRIPTION="a freedesktop.org compliant menu library for Xfce4" +HOMEPAGE="http://www.xfce.org/projects/libraries" +DEPENDS = "gettext pkgconfig libxfce4util intltool" +RDEPENDS_${PN} = "gtk+ libxfce4util" + +LICENSE="LGPL-2 FDL-1.1" +PR = "r0" + +inherit xfce46 + +SRC_URI[md5sum] = "ff10cacb76803ee37159e3a43345f0d1" +SRC_URI[sha256sum] = "62352be57318d6f241c4f6e4b6f9303d0b80246ea8f6e4753a962360a9965162" diff --git a/recipes/xfce-base/libxfce4util_4.6.2.bb b/recipes/xfce-base/libxfce4util_4.6.2.bb new file mode 100644 index 0000000000..67aba2e75b --- /dev/null +++ b/recipes/xfce-base/libxfce4util_4.6.2.bb @@ -0,0 +1,18 @@ +# libxfce4util OE build file + +DESCRIPTION = "Basic utility library for Xfce4" +SECTION = "x11/libs" +LICENSE = "GPL" +DEPENDS = "glib-2.0 xfce4-dev-tools " +PR = "r0" + +inherit xfce46 + +EXTRA_OECONF += "--disable-dependency-tracking --disable-static --with-broken-putenv=yes" + +MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4" + +FILES_${PN}-dev += " ${datadir}/xfce4/m4" + +SRC_URI[md5sum] = "9c3129d827d480f0906c575e7a13f1e9" +SRC_URI[sha256sum] = "ae2e7ed1000bb0b3589643a39a65e6ab64c9ee198045e7b272604986f2e18c83" diff --git a/recipes/xfce-base/libxfcegui4_4.6.4.bb b/recipes/xfce-base/libxfcegui4_4.6.4.bb new file mode 100644 index 0000000000..255f482751 --- /dev/null +++ b/recipes/xfce-base/libxfcegui4_4.6.4.bb @@ -0,0 +1,17 @@ +# libxfcegui4 OE build file + +DESCRIPTION = "Xfce4 Widget library and X Window System interaction" +DEPENDS = "gettext pkgconfig intltool virtual/libx11 libxfce4util xfconf dbh libxml2 gtk+ libglade" +RDEPENDS_${PN} = "xfconf startup-notification " + +SECTION = "x11/libs" +PR = "r0" + +inherit xfce46 + +LEAD_SONAME = "libxfcegui4.so.4" + +FILES_${PN} += "${libdir}/xfce4/modules ${libdir}/libglade/2.0/*.so ${datadir}/xfce4/mime ${datadir}/icons/hicolor" + +SRC_URI[md5sum] = "88de59b222cb9977f93a4c61011c1e1f" +SRC_URI[sha256sum] = "c37e407dc00fb87dc16758d53e69edeac7b32aa76c5fcad2b784cf22f58af421" diff --git a/recipes/xfce-base/thunar_1.0.2.bb b/recipes/xfce-base/thunar_1.0.2.bb new file mode 100644 index 0000000000..d35c44d668 --- /dev/null +++ b/recipes/xfce-base/thunar_1.0.2.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "File manager for the Xfce Desktop Environment" +HOMEPAGE="http://thunar.xfce.org" +DEPENDS = "exo dbus-glib libexif xfce4-panel libice libsm gamin" +RDEPENDS_${PN} = "libxfcegui4 exo dbus-glib libexif xfce4-panel libice libsm gamin" +RRECOMMENDS_${PN} = "shared-mime-info" +SECTION = "x11" +PR = "r0" + +inherit xfce46 + +XFCE_VERSION = "4.6.2" + +SRC_URI = "http://www.us.xfce.org/archive/xfce-${XFCE_VERSION}/src/Thunar-${PV}.tar.bz2" + +S = "${WORKDIR}/Thunar-${PV}/" + +EXTRA_OECONF += "--disable-dependency-tracking --enable-dbus" + +FILES_${PN} += "${libdir}/thunarx-1/*.so \ + ${libdir}/thunarx-1/*.la \ + ${datadir}/dbus-1 \ + ${datadir}/thumbnailers \ + ${datadir}/Thunar \ + ${datadir}/xfce4" +FILES_${PN}-dbg += "${libdir}/thunarx-1/.debug/ ${libexecdir}/xfce4/panel-plugins/.debug/" + +SRC_URI[md5sum] = "c91073202d373a1f9951a1240083c36d" +SRC_URI[sha256sum] = "75829b34a68346b33f66882bedc9794d580c200d11af22541885750459b55c03" diff --git a/recipes/xfce-base/xfce-terminal_0.4.5.bb b/recipes/xfce-base/xfce-terminal_0.4.5.bb new file mode 100644 index 0000000000..2d5f94e4c3 --- /dev/null +++ b/recipes/xfce-base/xfce-terminal_0.4.5.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Terminal emulator for the Xfce desktop environment" +DEPENDS = "exo vte dbus-glib gtk+" +RDEPENDS_${PN} += "gnome-pty-helper" +PR = "r0" + +inherit xfce46 + +SRC_URI = "http://www.xfce.org/archive/src/apps/terminal/0.4/Terminal-${PV}.tar.bz2 \ +" + +S = "${WORKDIR}/Terminal-${PV}" + +FILES_${PN} += "${datadir}/Terminal" + +SRC_URI[md5sum] = "3c707628e2e97c6d9566cd74d400036a" +SRC_URI[sha256sum] = "92fddcbc1422076672d8ec61832793d4ceea2fc0db7d724a6acde0ec2bac8893" diff --git a/recipes/xfce-base/xfce-utils_4.6.2.bb b/recipes/xfce-base/xfce-utils_4.6.2.bb new file mode 100644 index 0000000000..08048c4285 --- /dev/null +++ b/recipes/xfce-base/xfce-utils_4.6.2.bb @@ -0,0 +1,30 @@ +DESCRIPTION="Xfce4 Utilities" +DEPENDS = "virtual/libx11 libxfcegui4" +SECTION = "x11" +PR = "r0" + +inherit xfce46 + +FILES_${PN} += " \ + ${bindir}/* \ + ${datadir}/dbus-1/* \ + ${datadir}/xfce4/AUTHORS \ + ${datadir}/xfce4/BSD \ + ${datadir}/xfce4/COPYING \ + ${datadir}/xfce4/GPL \ + ${datadir}/xfce4/INFO* \ + ${datadir}/xfce4/LGPL \ + ${datadir}/xfce4/AUTHORS.html \ + ${datadir}/xfce4/BSD.html \ + ${datadir}/xfce4/COPYING.html \ + ${datadir}/xfce4/GPL.html \ + ${datadir}/xfce4/INFO.html \ + ${datadir}/xfce4/LGPL.html \ + ${datadir}/xsessions/xfce.desktop \ +" + +# NOTE: This package takes a --with-browser for the default browser +# NOTE: Works with gdm also gtkhtml + +SRC_URI[md5sum] = "5d23407700d7e8c9751e17a5bc955109" +SRC_URI[sha256sum] = "54efc2038bfbd5acaadfc91ed91fb3dfd6cec64f9402f364accce7bcafe2ba7a" diff --git a/recipes/xfce-base/xfce4-appfinder_4.6.2.bb b/recipes/xfce-base/xfce4-appfinder_4.6.2.bb new file mode 100644 index 0000000000..a73383d104 --- /dev/null +++ b/recipes/xfce-base/xfce4-appfinder_4.6.2.bb @@ -0,0 +1,11 @@ +# xfce4-appfinder build file + +DESCRIPTION="Xfce4 Application Finder" +DEPENDS="libxfcegui4 libxfce4menu thunar" +SECTION = "x11" +PR = "r0" + +inherit xfce46 + +SRC_URI[md5sum] = "7752e43578b821e35010bcd3762da166" +SRC_URI[sha256sum] = "a1bf35b838922a7f81f588c727a6ef2f56b1bed0c46f7c36b209ac336f7e492a" diff --git a/recipes/xfce-base/xfce4-panel_4.6.4.bb b/recipes/xfce-base/xfce4-panel_4.6.4.bb new file mode 100644 index 0000000000..fe402b8690 --- /dev/null +++ b/recipes/xfce-base/xfce4-panel_4.6.4.bb @@ -0,0 +1,30 @@ +# xfce4-panel OE build file + +DESCRIPTION = "Xfce4 Panel" +DEPENDS = "virtual/libx11 startup-notification libxfcegui4 libxml2 exo libwnck" +SECTION = "x11" +PR = "r0" + +inherit xfce46 + +SRC_URI[md5sum] = "82f10a42aefca4cc26a6633e7478cc65" +SRC_URI[sha256sum] = "cc9b70bdc73ab80f46655a34cdbaf876a67cd90b50230cbf4d77a3106a5c54e7" + +EXTRA_OECONF += " --enable-startup-notification" + +do_install() { + oe_runmake DESTDIR=${D} install +} + +python populate_packages_prepend() { + plugin_dir = bb.data.expand('${libdir}/xfce4/panel-plugins/', d) + plugin_name = bb.data.expand('${PN}-plugin-%s', d) + do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name, + '${PN} plugin for %s', extra_depends='', prepend=True, + aux_files_pattern=['${datadir}/xfce4/panel-plugins/%s.desktop', + '${sysconfdir}/xdg/xfce/panel/%s-*', + '${datadir}/icons/hicolor/48x48/apps/*-%s.png', + '${bindir}/*%s*']) +} + +PACKAGES_DYNAMIC = "${PN}-plugin-*" diff --git a/recipes/xfce-base/xfce4-session_4.6.2.bb b/recipes/xfce-base/xfce4-session_4.6.2.bb new file mode 100644 index 0000000000..c85bb8c5c3 --- /dev/null +++ b/recipes/xfce-base/xfce4-session_4.6.2.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "xfce4-session is a session manager for Xfce 4 Desktop Environment" +DEPENDS = "libxfcegui4 libxfce4util dbus iceauth xfce-utils" +SECTION = "x11" + +PR = "r0" + +inherit xfce46 + +RDEPENDS_${PN} = "iceauth xfce-utils xinit dbus-x11" + +FILES_${PN} += "${libdir}/xfce4/splash/engines/*.so" +FILES_${PN} += "${datadir}/xfce4/tips/*" +FILES_${PN} += "${datadir}/themes/Default/balou/*" + +FILES_${PN}-dbg += "${libdir}/xfce4/splash/engines/.debug/*.so" +FILES_${PN}-dbg += "${libdir}/xfce4/splash/engines/.debug/*.a" + +FILES_${PN}-dev += "${libdir}/xfce4/splash/engines/*.la" +FILES_${PN}-dev += "${libdir}/xfce4/splash/engines/*.a" + +SRC_URI[md5sum] = "9d9890130e45e0e9476591ed9ba2c9d5" +SRC_URI[sha256sum] = "725e269254c34c530acb670f5ccd0fd69b57cbe9f2176abd8499fc5d6dcd30a8" diff --git a/recipes/xfce-base/xfce4-settings_4.6.5.bb b/recipes/xfce-base/xfce4-settings_4.6.5.bb new file mode 100644 index 0000000000..65e4869158 --- /dev/null +++ b/recipes/xfce-base/xfce4-settings_4.6.5.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Xfce4 settings" +HOMEPAGE = "http://www.xfce.org" +SECTION = "x11/wm" +LICENSE = "GPL-2" + +DEPENDS = "virtual/libx11 virtual/xserver libxi libwnck xrandr exo libxfce4util libxfcegui4" + +PR = "r0" + +inherit xfce46 + +SRC_URI[md5sum] = "f988cb732913b5fbc115ad7105d2231e" +SRC_URI[sha256sum] = "1601b8d2cac5d931c39bed7e331c5bd91018d0e56663295e7a083a2c78fe168b" + +RDEPENDS_${PN} = "xfconf exo" + diff --git a/recipes/xfce-base/xfconf_4.6.2.bb b/recipes/xfce-base/xfconf_4.6.2.bb new file mode 100644 index 0000000000..3db4c917d8 --- /dev/null +++ b/recipes/xfce-base/xfconf_4.6.2.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Xfce configuration daemon and utilities" +HOMEPAGE = "http://www.xfce.org" +SECTION = "x11/wm" +LICENSE = "GPL-2" + +DEPENDS = "libxfce4util" +RDEPENDS_${PN} = "libxfce4util" + +PR = "r0" + +inherit xfce46 + +FILES_${PN} += "${datadir}/dbus-1/services/org.xfce.Xfconf.service" + +SRC_URI[md5sum] = "5ff93c15077c6dbbcd38c437bc1ab2ef" +SRC_URI[sha256sum] = "7b2635abc33ae6a76145238ed27557bc1ff91b1a5ee0757962f798a66d56f478" diff --git a/recipes/xfce-base/xfdesktop_4.6.2.bb b/recipes/xfce-base/xfdesktop_4.6.2.bb new file mode 100644 index 0000000000..c3a3bca232 --- /dev/null +++ b/recipes/xfce-base/xfdesktop_4.6.2.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Xfce4 Desktop Manager" +SECTION = "x11/base" + +DEPENDS = "virtual/libx11 exo libxfcegui4 xfce4-panel thunar gtk+" +RDEPENDS_${PN} = "libxfcegui4 libxml2 xfce4-panel thunar exo gtk+" +PR = "r0" + +inherit xfce46 + +do_configure() { + oe_runconf +} + +FILES_xfdesktop-backdrops = "${datadir}/xfce4/backdrops/*" +FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so \ + ${libdir}/xfce4/panel-plugins/xfce4-menu-plugin \ + ${datadir}/xfce4/panel-plugins/*.desktop" +FILES_${PN}-dbg += "${libexecdir}/xfce4/panel-plugins/.debug" + +SRC_URI[md5sum] = "e800ea9fee7a5c5eaf2ae96e23a83e3a" +SRC_URI[sha256sum] = "cd760f95486ba3f1c6d0179bb10a4c21c99c1d459dd8265823fed85f7376a3fb" diff --git a/recipes/xfce-base/xfwm4-themes-4.6.0/remove-double-files.patch b/recipes/xfce-base/xfwm4-themes-4.6.0/remove-double-files.patch new file mode 100644 index 0000000000..14dbe4d835 --- /dev/null +++ b/recipes/xfce-base/xfwm4-themes-4.6.0/remove-double-files.patch @@ -0,0 +1,10 @@ +--- xfwm4-themes-4.6.0/themes/redmond/Makefile.am 2009-02-26 00:54:06.000000000 +0100 ++++ xfwm4-themes-4.6.0/themes/redmond/Makefile.am~ 2010-06-14 11:10:00.000000000 +0200 +@@ -16,7 +16,6 @@ + left-inactive.xpm \ + maximize-active.xpm \ + maximize-toggled-active.xpm \ +- maximize-inactive.xpm \ + maximize-toggled-inactive.xpm \ + maximize-inactive.xpm \ + maximize-pressed.xpm \ diff --git a/recipes/xfce-base/xfwm4-themes_4.6.0.bb b/recipes/xfce-base/xfwm4-themes_4.6.0.bb index d71042b595..93f8e92c4c 100644 --- a/recipes/xfce-base/xfwm4-themes_4.6.0.bb +++ b/recipes/xfce-base/xfwm4-themes_4.6.0.bb @@ -1,7 +1,7 @@ # xfwm4-themes OE build file SECTION = "x11/wm" -PR = "r4" +PR = "r5" DEPENDS = "xfwm4 libglade libxml2" RDEPENDS_${PN} = "xfwm4 libglade libxml2" @@ -10,6 +10,10 @@ inherit xfce46 SRC_URI = "http://mocha.xfce.org/archive/src/art/xfwm4-themes/4.6/xfwm4-themes-${PV}.tar.bz2" +SRC_URI += " \ + file://remove-double-files.patch \ +" + PACKAGES_DYNAMIC = "xfwm4-theme-*" python populate_packages_prepend () { diff --git a/recipes/xfce-base/xfwm4_4.6.2.bb b/recipes/xfce-base/xfwm4_4.6.2.bb new file mode 100644 index 0000000000..3ea7f5281f --- /dev/null +++ b/recipes/xfce-base/xfwm4_4.6.2.bb @@ -0,0 +1,31 @@ +# xfwm4 OE build file + +DESCRIPTION="Xfce4 Window Manager" +SECTION = "x11/wm" +PR = "r0" + +inherit xfce46 update-alternatives + +FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*" + +DEPENDS = "startup-notification virtual/libx11 libxpm libxfce4util libxfcegui4" +RDEPENDS_${PN} = "xfwm4-theme-default" + +EXTRA_OECONF += " --enable-startup-notification" + +PACKAGES_DYNAMIC += "xfwm4-theme-*" + +python populate_packages_prepend () { + themedir = bb.data.expand('${datadir}/themes', d) + do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) +} + +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PATH = "${bindir}/xfce4-session" +ALTERNATIVE_PRIORITY = "30" + +FILES_${PN}-dbg += "${libexecdir}/xfce4/xfwm4/.debug/*" + +SRC_URI[md5sum] = "3e6c0c54b028b6ea60e865e55ecdf3f8" +SRC_URI[sha256sum] = "212819ee03c24635f79d50930284c422469e22489952d0b286e6fe5af2155828" diff --git a/recipes/xfsprogs/libattr_2.4.43.bb b/recipes/xfsprogs/libattr_2.4.43.bb deleted file mode 100644 index cf846cc25d..0000000000 --- a/recipes/xfsprogs/libattr_2.4.43.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "library functions to get attribute bits" -HOMEPAGE = "http://oss.sgi.com/projects/xfs" -LICENSE = "GPL" -SECTION = "base" -PR = "r0" -DEPENDS = "gettext" - -SRC_URI = "ftp://oss.sgi.com/projects/xfs/cmd_tars/attr_${PV}-1.tar.gz" -S = "${WORKDIR}/attr-${PV}" - -PARALLEL_MAKE = "" -inherit autotools -EXTRA_OECONF = "--enable-gettext=no --enable-shared=yes" - -do_configure () { - export LIBTOOL="${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool" - export DEBUG="-DNDEBUG" - oe_runconf -} - -do_install () { - export DIST_ROOT=${D} - oe_runmake install - oe_libinstall -a libattr ${D}${libdir} - oe_libinstall -a libattr ${STAGING_LIBDIR} -} - - -SRC_URI[md5sum] = "91583a14bcbd637adaa9b07ea49c5d4b" -SRC_URI[sha256sum] = "d358b233b3e2ad235e63fd8697e337006fc7506844e424b0d9dd7a24affec5bf" |