diff options
39 files changed, 27484 insertions, 74 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index b4e78f8118..82b5311ef5 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -190,6 +190,10 @@ autotools_stage_all() { autotools_stage_dir ${STAGE_TEMP}/${base_bindir} ${STAGING_DIR_HOST}${layout_base_bindir} autotools_stage_dir ${STAGE_TEMP}/${base_sbindir} ${STAGING_DIR_HOST}${layout_base_sbindir} autotools_stage_dir ${STAGE_TEMP}/${libexecdir} ${STAGING_DIR_HOST}${layout_libexecdir} + if [ "${prefix}/lib" != "${libdir}" ]; then + # python puts its files in here, make sure they are staged as well + autotools_stage_dir ${STAGE_TEMP}/${prefix}/lib ${STAGING_DIR_HOST}${layout_prefix}/lib + fi fi if [ -d ${STAGE_TEMP}/${libdir} ] then diff --git a/classes/package.bbclass b/classes/package.bbclass index a12bfb0a21..0601885046 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -594,6 +594,11 @@ python package_do_shlibs() { else: snap_symlinks = False + if (bb.data.getVar('USE_LDCONFIG', d, True) or "1") == "1": + use_ldconfig = True + else: + use_ldconfig = False + needed = {} private_libs = bb.data.getVar('PRIVATE_LIBS', d, 1) for pkg in packages.split(): @@ -647,7 +652,7 @@ python package_do_shlibs() { fd.write(ver + '\n') fd.close() package_stagefile(shver_file, d) - if needs_ldconfig: + if needs_ldconfig and use_ldconfig: bb.debug(1, 'adding ldconfig call to postinst for %s' % pkg) postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1) if not postinst: diff --git a/conf/checksums.ini b/conf/checksums.ini index dc7e678002..19f67e06c8 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1290,6 +1290,10 @@ sha256=c450b49ce9903d97ed5e4aa788b388e014c0eddcfc038b000237f67cd4528a3b md5=5afcef5d6047f14cd5f65d2fdbd86fb2 sha256=43debdc36c9aed8a2ef366bf3e98c1440e643a5ae9e7e1423b6309ddee5ae25e +[ftp://ftp.pl.debian.org/pub/debian/pool/main/b/base-passwd/base-passwd_3.5.19.tar.gz] +md5=5afcef5d6047f14cd5f65d2fdbd86fb2 +sha256=43debdc36c9aed8a2ef366bf3e98c1440e643a5ae9e7e1423b6309ddee5ae25e + [ftp://ftp.us.debian.org/debian/pool/main/b/base-passwd/base-passwd_3.5.19.tar.gz] md5=5afcef5d6047f14cd5f65d2fdbd86fb2 sha256=43debdc36c9aed8a2ef366bf3e98c1440e643a5ae9e7e1423b6309ddee5ae25e @@ -1910,6 +1914,10 @@ sha256=6a045d34561b8548ae08ca7d0803d77fc2b70bdfc61793aa0a99e59a91059443 md5=9c9f06c2d949c6de844c7bed8eb47064 sha256=cf3957b4548df051cd0971d179cb92dc0fcab3839977ddb70aae81c14cd04b03 +[http://www.busybox.net/downloads/busybox-1.11.3.tar.gz] +md5=d113f2777e4f508faa8b674ece87a37b +sha256=f2b433270f22aad86f61cef61d95338aaa63dbe2f9468b9ed5defd1c01c9645f + [http://www.busybox.net/downloads/busybox-1.2.0.tar.gz] md5=6af69ebbbf8adc874ccb6d67dca95df5 sha256=df6e3b0079194251a2ff68d7be7b06025c79f4fe62f4a73158ee52ff4bc515a0 @@ -2078,6 +2086,10 @@ sha256=015c4237a532b873990aeeecdf351138ce5a811d062d6db73c611a4985de5435 md5=b8c51a2e3cccb381428426c0fc543244 sha256=f1e44d628cc4cbac192bf33f492ad8d1e1988cae576924128df36f3638e9a485 +[http://alioth.debian.org/download.php/2482/ccid-1.3.8.tar.bz2] +md5=ebb5fc927d73cd63737a9114481e8957 +sha256=8cb892ef36321069eff7826aa732f1481715fe54bf96346fae1d25565b44c536 + [http://surfnet.dl.sourceforge.net/sourceforge/xbplayer/ccxstream-1.0.15.tar.gz] md5=c589fff48ce541f26b394c9d82ccbead sha256=2dec31ba4a176c921a653c0949a53c2d3497e047737724350897fd2534db18fe @@ -3498,6 +3510,10 @@ sha256=2cbf95aef9e3f9a32b6859ae35723eaa76b5ed483ddaa654cf627d1eacdea5fa md5=9441c981bfd4e521abcd5d93385f71d8 sha256=06c2772ae6e446227f6798ad8994fcdb1fe64385bc83a34f7e29fd8af2e4f5da +[ftp://ftp.pl.debian.org/pub/debian/pool/main/f/fakeroot/fakeroot_1.9.6.tar.gz] +md5=9441c981bfd4e521abcd5d93385f71d8 +sha256=06c2772ae6e446227f6798ad8994fcdb1fe64385bc83a34f7e29fd8af2e4f5da + [ftp://ftp.us.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.9.6.tar.gz] md5=9441c981bfd4e521abcd5d93385f71d8 sha256=06c2772ae6e446227f6798ad8994fcdb1fe64385bc83a34f7e29fd8af2e4f5da @@ -11942,6 +11958,10 @@ sha256=5bad39b0d28f294f10690d15bc1e54ba549324a7ce26db1406f3c3a50cd1d504 md5=b5f96d823b1183ba0c4e61516e1a23c0 sha256=45994ebcdd4ed30b37c6fc0569ee69aee4f2ef9ed75857d0a3784ce3bfe92ffc +[http://kernel.org/pub/linux/kernel/v2.6/testing/v2.6.26/patch-2.6.26-rc4.bz2] +md5=b5f96d823b1183ba0c4e61516e1a23c0 +sha256=45994ebcdd4ed30b37c6fc0569ee69aee4f2ef9ed75857d0a3784ce3bfe92ffc + [http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.27-rc1.bz2] md5=948b25bab0082d1db5bd8c9fac824891 sha256=2b35a35a0ab3b82b77bb2996782ef70ec15a13b9331b15bac814b891ae8f4867 @@ -12050,6 +12070,10 @@ sha256=1849733ce494a51334bd1cbf4cc96c63b037256ddab8cb2dc3672db916bb3094 md5=2af38e083fb90ef60fa9eda7cc290e86 sha256=362e4b4473f2f7a3bfa28ea73e80ec00a2fe525a1aceb5f66e1c528a900bd735 +[http://alioth.debian.org/download.php/2479/pcsc-lite-1.4.102.tar.bz2] +md5=b97d3a725ab93662adf09acfbc49efeb +sha256=56fc9e6324539537324b071e5b51c3388df9bfa92fb7e210b989b463122fc333 + [http://handhelds.org/~zecke/oe_packages/pdamaze_V1.0.0.tar.gz] md5=bf27dd51fe03c8b475080b74de043a13 sha256=99d6bc6b360baabd6044e8883d467cc6ed7955f9ab66d8f87f61e3cc757fb97a @@ -17629,3 +17653,4 @@ sha256=12f5b654f6b91953391d2492a09d2c9586d5b7af419f0eeb306e1d30245659d3 [http://downloads.sourceforge.net/zziplib/zziplib-0.10.82.tar.bz2] md5=a6538f6c44ceeed0ed7e8e356f444168 sha256=f684397ce39ec400ba3369521892b7c3a8711d3ef1be59115db9f8d57707bbb8 + diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 097e61f701..9cef972fb8 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -1,5 +1,5 @@ PREFERRED_VERSION_automake-native = "1.10" -PREFERRED_VERSION_busybox = "1.11.1" +PREFERRED_VERSION_busybox = "1.11.3" PREFERRED_VERSION_cairo = "1.7.6" PREFERRED_VERSION_dbus = "1.2.1" PREFERRED_VERSION_dropbear = "0.51" diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 6ca62db060..3d3c3858e0 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -117,7 +117,7 @@ PREFERRED_VERSION_btscanner ?= "2.0" PREFERRED_VERSION_btsco ?= "0.42" PREFERRED_VERSION_btsco-module ?= "0.42" PREFERRED_VERSION_btxml ?= "1.0" -PREFERRED_VERSION_busybox = "1.11.1" +PREFERRED_VERSION_busybox = "1.11.3" PREFERRED_VERSION_busybox-static ?= "1.2.1" PREFERRED_VERSION_bvi ?= "1.3.1" PREFERRED_VERSION_bwmon ?= "1.3" @@ -432,7 +432,7 @@ PREFERRED_VERSION_gdb-cross ?= "6.8" PREFERRED_VERSION_gdb-cross-sdk ?= "6.8" PREFERRED_VERSION_gdbm ?= "1.8.3" PREFERRED_VERSION_gdbm-native ?= "1.8.3" -PREFERRED_VERSION_gdk-pixbuf-csource-native ?= "2.10.14" +PREFERRED_VERSION_gdk-pixbuf-csource-native ?= "2.12.11" PREFERRED_VERSION_gdm ?= "2.14.9" PREFERRED_VERSION_geda ?= "20050820" PREFERRED_VERSION_geda-gattrib ?= "20050820" @@ -1932,8 +1932,8 @@ PREFERRED_VERSION_util-macros ?= "1.1.5" PREFERRED_VERSION_util-macros-native ?= "1.1.5" PREFERRED_VERSION_uucp ?= "1.07" PREFERRED_VERSION_v4l2apps ?= "20020317" -PREFERRED_VERSION_vala ?= "0.1.5" -PREFERRED_VERSION_vala-native ?= "0.1.5" +PREFERRED_VERSION_vala ?= "0.3.5" +PREFERRED_VERSION_vala-native ?= "0.3.5" PREFERRED_VERSION_vde ?= "2.0.2" PREFERRED_VERSION_vectoroids ?= "1.1.0" PREFERRED_VERSION_videoplayer ?= "0.1" diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py index a7ad9e7a2a..f33ba7e23d 100755 --- a/contrib/python/generate-manifest-2.5.py +++ b/contrib/python/generate-manifest-2.5.py @@ -170,7 +170,7 @@ if __name__ == "__main__": m.addPackage( 0, "python-audio", "Python Audio Handling", "python-core", "wave.* chunk.* sndhdr.* lib-dynload/ossaudiodev.so lib-dynload/audioop.so" ) - m.addPackage( 1, "python-bsddb", "Python Berkeley Database Bindings", "python-core", + m.addPackage( 0, "python-bsddb", "Python Berkeley Database Bindings", "python-core", "bsddb lib-dynload/_bsddb.so" ) # package m.addPackage( 0, "python-codecs", "Python Codecs, Encodings & i18n Support", "python-core python-lang", @@ -182,10 +182,10 @@ if __name__ == "__main__": m.addPackage( 0, "python-compiler", "Python Compiler Support", "python-core", "compiler" ) # package - m.addPackage( 1, "python-compression", "Python High Level Compression Support", "python-core python-zlib", + m.addPackage( 0, "python-compression", "Python High Level Compression Support", "python-core python-zlib", "gzip.* zipfile.* tarfile.*" ) - m.addPackage( 1, "python-crypt", "Python Basic Cryptographic and Hashing Support", "python-core", + m.addPackage( 0, "python-crypt", "Python Basic Cryptographic and Hashing Support", "python-core", "hashlib.* md5.* sha.* lib-dynload/crypt.so lib-dynload/_hashlib.so lib-dynload/_sha256.so lib-dynload/_sha512.so" ) m.addPackage( 0, "python-textutils", "Python Option Parsing, Text Wrapping and Comma-Separated-Value Support", "python-core python-io python-re python-stringold", @@ -203,7 +203,7 @@ if __name__ == "__main__": m.addPackage( 0, "python-db", "Python File-Based Database Support", "python-core", "anydbm.* dumbdbm.* whichdb.* " ) - m.addPackage( 1, "python-debugger", "Python Debugger", "python-core python-io python-lang python-re python-stringold python-shell python-pprint", + m.addPackage( 0, "python-debugger", "Python Debugger", "python-core python-io python-lang python-re python-stringold python-shell python-pprint", "bdb.* pdb.*" ) m.addPackage( 0, "python-difflib", "Python helpers for computing deltas between objects.", "python-lang python-re", @@ -237,18 +237,15 @@ if __name__ == "__main__": "lib-dynload/_socket.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so " "pipes.* socket.* tempfile.* StringIO.* " ) - m.addPackage( 1, "python-lang", "Python Low-Level Language Support", "python-core", + m.addPackage( 0, "python-lang", "Python Low-Level Language Support", "python-core", "lib-dynload/array.so lib-dynload/parser.so lib-dynload/operator.so lib-dynload/_weakref.so " + "lib-dynload/itertools.so lib-dynload/collections.so lib-dynload/_bisect.so lib-dynload/_heapq.so " + "atexit.* bisect.* code.* codeop.* dis.* heapq.* inspect.* keyword.* opcode.* symbol.* repr.* token.* " + " tokenize.* traceback.* linecache.* weakref.*" ) - m.addPackage( 1, "python-logging", "Python Logging Support", "python-core python-io python-lang python-pickle python-stringold", + m.addPackage( 0, "python-logging", "Python Logging Support", "python-core python-io python-lang python-pickle python-stringold", "logging" ) # package - m.addPackage( 0, "python-lib-old-and-deprecated", "Python Deprecated Libraries", "python-core", - "lib-old" ) # package - m.addPackage( 0, "python-tkinter", "Python Tcl/Tk Bindings", "python-core", "lib-dynload/_tkinter.so lib-tk" ) # package @@ -292,7 +289,7 @@ if __name__ == "__main__": m.addPackage( 0, "python-resource", "Python Resource Control Interface", "python-core", "lib-dynload/resource.so" ) - m.addPackage( 1, "python-shell", "Python Shell-Like Functionality", "python-core python-re", + m.addPackage( 0, "python-shell", "Python Shell-Like Functionality", "python-core python-re", "cmd.* commands.* dircache.* fnmatch.* glob.* popen2.* shlex.* shutil.*" ) m.addPackage( 0, "python-robotparser", "Python robots.txt parser", "python-core python-netclient", @@ -325,7 +322,7 @@ if __name__ == "__main__": m.addPackage( 0, "python-unittest", "Python Unit Testing Framework", "python-core python-stringold python-lang", "unittest.*" ) - m.addPackage( 1, "python-xml", "Python basic XML support.", "python-core python-re", + m.addPackage( 0, "python-xml", "Python basic XML support.", "python-core python-re", "lib-dynload/pyexpat.so xml xmllib.*" ) # package m.addPackage( 0, "python-xmlrpc", "Python XMLRPC Support", "python-core python-xml python-netserver python-lang", diff --git a/contrib/weekly-changelog-report.py b/contrib/weekly-changelog-report.py new file mode 100755 index 0000000000..b5e70cb5be --- /dev/null +++ b/contrib/weekly-changelog-report.py @@ -0,0 +1,28 @@ +#!/usr/bin/python + + +# generates an OE changelog for last weeks activity (Mon-Sun) assuming it is run on +# any day of the following week + +# TODO +# - remove patch count as it does not match after we remove "Merge branch" statements +# - add bugzilla info + +import datetime +import os + +today = datetime.date.today() + +# 0 = Mon, 6 = Sun +today_weekday = today.weekday() + +# find Mon of this week +end_day = today - datetime.timedelta(today_weekday) + +start_day = end_day - datetime.timedelta(7) + +print "OE weekly changelog %s to %s\n" % (start_day.isoformat(), end_day.isoformat()) + +os.system("git-shortlog --since=%s --until=%s | grep -v \"Merge branch\"" % (start_day.isoformat(), end_day.isoformat())) + + diff --git a/packages/bluez/bluez-utils3.inc b/packages/bluez/bluez-utils3.inc index 0bbba2cd14..c4debd01b2 100644 --- a/packages/bluez/bluez-utils3.inc +++ b/packages/bluez/bluez-utils3.inc @@ -76,9 +76,14 @@ OE_LT_RPATH_ALLOW[export]="1" do_install_append() { install -d ${D}${base_sbindir} ${D}${base_bindir}/ ${D}${sysconfdir}/apm/event.d/ - mv ${D}${sbindir}/* ${D}${base_sbindir}/ - mv ${D}${bindir}/* ${D}${base_bindir}/ - rmdir ${D}${bindir} ${D}${sbindir} + if [ "${sbindir}" != "${base_sbindir}" ]; then + mv ${D}${sbindir}/* ${D}${base_sbindir}/ + rmdir ${D}${sbindir} + fi + if [ "${bindir}" != "${base_bindir}" ]; then + mv ${D}${bindir}/* ${D}${base_bindir}/ + rmdir ${D}${bindir} + fi chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/ install -m 0644 ${S}/rfcomm/rfcomm.conf ${D}${sysconfdir}/bluetooth/ diff --git a/packages/busybox/busybox-1.11.1/angstrom/defconfig b/packages/busybox/busybox-1.11.3/angstrom/defconfig index f3130caca8..f3130caca8 100644 --- a/packages/busybox/busybox-1.11.1/angstrom/defconfig +++ b/packages/busybox/busybox-1.11.3/angstrom/defconfig diff --git a/packages/busybox/busybox-1.11.1/defconfig b/packages/busybox/busybox-1.11.3/defconfig index a7b8ed53a0..a7b8ed53a0 100644 --- a/packages/busybox/busybox-1.11.1/defconfig +++ b/packages/busybox/busybox-1.11.3/defconfig diff --git a/packages/busybox/busybox-1.11.1/slugos/defconfig b/packages/busybox/busybox-1.11.3/slugos/defconfig index d922529cc2..d922529cc2 100644 --- a/packages/busybox/busybox-1.11.1/slugos/defconfig +++ b/packages/busybox/busybox-1.11.3/slugos/defconfig diff --git a/packages/busybox/busybox-1.11.1/udhcpscript.patch b/packages/busybox/busybox-1.11.3/udhcpscript.patch index fc21d440cd..fc21d440cd 100644 --- a/packages/busybox/busybox-1.11.1/udhcpscript.patch +++ b/packages/busybox/busybox-1.11.3/udhcpscript.patch diff --git a/packages/busybox/busybox.inc b/packages/busybox/busybox.inc index cc196ad767..63f839e246 100644 --- a/packages/busybox/busybox.inc +++ b/packages/busybox/busybox.inc @@ -58,6 +58,13 @@ do_compile() { } do_install () { + oe_runmake busybox.links + if [ "x${layout_prefix}" = "x" ]; then + sed 's:^/usr/:/:' < busybox.links >busybox.links.new + mv busybox.links.new busybox.links + elif [ "${layout_prefix}" != "/usr" ]; then + echo "warning, busybox.links will lose with this prefix" + fi unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS install -d ${D}${sysconfdir}/init.d oe_runmake "PREFIX=${D}" install @@ -67,7 +74,11 @@ do_install () { install -d ${D}/busybox ls ${D} -R - cp -dPr ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/ + for i in ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ; do + if [ -d $i ]; then + cp -dPr $i ${D}/busybox/ + fi + done # Move the busybox binary back to /bin install -d ${D}${base_bindir} mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/ diff --git a/packages/busybox/busybox_1.11.1.bb b/packages/busybox/busybox_1.11.3.bb index 60302fc55a..ce2b51a24b 100644 --- a/packages/busybox/busybox_1.11.1.bb +++ b/packages/busybox/busybox_1.11.3.bb @@ -1,10 +1,8 @@ require busybox.inc -FILE_PR = "r3" +FILE_PR = "r0" SRC_URI = "\ http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ - http://busybox.net/downloads/fixes-1.11.1/busybox-1.11.1-basename.patch;patch=1 \ - http://busybox.net/downloads/fixes-1.11.1/busybox-1.11.1-tar.patch;patch=1 \ \ file://udhcpscript.patch;patch=1 \ file://busybox-cron \ diff --git a/packages/ccid/ccid_1.3.8.bb b/packages/ccid/ccid_1.3.8.bb new file mode 100644 index 0000000000..033af6c3d5 --- /dev/null +++ b/packages/ccid/ccid_1.3.8.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Generic USB CCID smart card reader driver" +HOMEPAGE = "http://pcsclite.alioth.debian.org/ccid.html" +LICENSE = "GPL" +FILE_PR = "r0" + +DEPENDS = "libusb pcsc-lite" +RDEPENDS = "pcsc-lite" + +SRC_URI = "http://alioth.debian.org/download.php/2482/ccid-${PV}.tar.bz2" + +inherit autotools + +EXTRA_OECONF = "--enable-udev" + +do_install_append () { + install -d "${D}/etc/udev/rules.d" + install -m 644 "${S}/src/pcscd_ccid.rules" "${D}/etc/udev/rules.d/85-pcscd_ccid.rules" +} + +FILES_${PN} += "${libdir}/pcsc/" +FILES_${PN}-dbg += "${libdir}/pcsc/drivers/*/*/*/.debug" diff --git a/packages/dmidecode/dmidecode_2.9.bb b/packages/dmidecode/dmidecode_2.9.bb index cc46524799..bb13500eff 100644 --- a/packages/dmidecode/dmidecode_2.9.bb +++ b/packages/dmidecode/dmidecode_2.9.bb @@ -1,10 +1,12 @@ DESCRIPTION = "DMI (Desktop Management Interface) table related utilities" HOMEPAGE = "http://www.nongnu.org/dmidecode/" LICENSE = "GPLv2" -PR = "r0" +FILE_PR = "r0" SRC_URI = "http://savannah.nongnu.org/download/dmidecode/${P}.tar.bz2" +COMPATIBLE_HOST = "i.86.*-linux" + do_unpack_extra() { sed -i \ -e '/^prefix/s:/usr/local:/usr:' \ diff --git a/packages/dsplink/dsplink_1.51.00.08.bb b/packages/dsplink/dsplink_1.51.00.08.bb index 756ce3e760..8bbff51917 100644 --- a/packages/dsplink/dsplink_1.51.00.08.bb +++ b/packages/dsplink/dsplink_1.51.00.08.bb @@ -20,7 +20,7 @@ SRC_URI = "http://install.tarball.in.source.dir/dsplink_1_51_00_08.tar.gz \ " SRC_URI_append_beagleboard = " \ - file://dsplink-128M.patch;patch=1;pnum=2 \ +# file://dsplink-128M.patch;patch=1;pnum=2 \ " S = "${WORKDIR}/dsplink_1_51_00_08/dsplink" diff --git a/packages/kexecboot/linux-kexecboot-2.6.26/collie/defconfig b/packages/kexecboot/linux-kexecboot-2.6.26/collie/defconfig index 4434962a64..2e7c8130f6 100644 --- a/packages/kexecboot/linux-kexecboot-2.6.26/collie/defconfig +++ b/packages/kexecboot/linux-kexecboot-2.6.26/collie/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.26 -# Thu Jul 24 23:13:04 2008 +# Sat Oct 18 23:52:11 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -34,7 +34,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -49,6 +49,8 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_NAMESPACES is not set CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="initramfs.cpio.gz" +CONFIG_INITRAMFS_ROOT_UID=0 +CONFIG_INITRAMFS_ROOT_GID=0 CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_EMBEDDED=y @@ -251,7 +253,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 rootdelay=3 mem=64M fbcon=rotate:1 dyntick=enable" +CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 mem=64M fbcon=rotate:1" # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y CONFIG_ATAGS_PROC=y @@ -342,14 +344,12 @@ CONFIG_MTD_CFI_I2=y # CONFIG_MTD_RAM is not set # CONFIG_MTD_ROM is not set # CONFIG_MTD_ABSENT is not set -CONFING_MTD_SHARP=y +CONFIG_MTD_SHARP=y # # 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_SA1100=y # CONFIG_MTD_PLATRAM is not set diff --git a/packages/kexecboot/linux-kexecboot_2.6.26.bb b/packages/kexecboot/linux-kexecboot_2.6.26.bb index 7d000ff2e1..26af506132 100644 --- a/packages/kexecboot/linux-kexecboot_2.6.26.bb +++ b/packages/kexecboot/linux-kexecboot_2.6.26.bb @@ -1,6 +1,6 @@ require linux-kexecboot.inc -FILE_PR = "r5" +FILE_PR = "r6" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_qemuarm = "-1" DEFAULT_PREFERENCE_qemux86 = "-1" diff --git a/packages/libffi/libffi_2.0+gcc4.3.2.bb b/packages/libffi/libffi_2.0+gcc4.3.2.bb new file mode 100644 index 0000000000..300df81564 --- /dev/null +++ b/packages/libffi/libffi_2.0+gcc4.3.2.bb @@ -0,0 +1,64 @@ +SECTION = "libs" +DESCRIPTION = "Foreign Function Interface library" +LICENSE = "libffi" +PRIORITY = "optional" + +inherit autotools gettext + +PACKAGES = "${PN}-dbg ${PN} ${PN}-dev" + +FILES_${PN} = "${libdir}/libffi.so.*" + +FILES_${PN}-dev = "${includedir}/ffi* \ + ${libdir}/libffi.a \ + ${libdir}/libffi.la \ + ${libdir}/libffi.so" + +GCC_VER = "${@bb.data.getVar('PV',d,1).split('gcc')[1]}" + +SRC_URI = "${GNU_MIRROR}/gcc/gcc-${GCC_VER}/gcc-${GCC_VER}.tar.bz2 \ + " + +MIRRORS_prepend () { +${GNU_MIRROR}/gcc/ http://gcc.get-software.com/releases/ +${GNU_MIRROR}/gcc/ http://mirrors.rcn.net/pub/sourceware/gcc/releases/ +} + +S = "${WORKDIR}/gcc-${GCC_VER}/libffi" +B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" + +EXTRA_OECONF = "--with-gnu-ld \ + --enable-shared \ + --enable-target-optspace \ + --enable-languages=c,c++,f77 \ + --enable-threads=posix \ + --enable-multilib \ + --enable-c99 \ + --enable-long-long \ + --enable-symvers=gnu \ + --program-prefix=${TARGET_PREFIX} \ + ${EXTRA_OECONF_PATHS}" + +EXTRA_OECONF_PATHS = "--with-local-prefix=${prefix}/local \ + --with-gxx-include-dir=${includedir}/c++/${PV}" + +do_configure () { + (cd ${S}/.. && gnu-configize) || die "failure running gnu-configize" + oe_runconf +} + +do_install_append() { + # follow debian and move this to $includedir + mv ${D}${libdir}/gcc/${TARGET_SYS}/${GCC_VER}/include/libffi/ffitarget.h ${D}${includedir}/ +} + +ffi_include = "ffi.h ffitarget.h" + +do_stage () { + oe_libinstall -so -C .libs libffi ${STAGING_LIBDIR} + + mkdir -p ${STAGING_INCDIR}/ + for i in ${ffi_include}; do + install -m 0644 include/$i ${STAGING_INCDIR}/ + done +} diff --git a/packages/linux/linux-rp-2.6.26/defconfig-collie b/packages/linux/linux-rp-2.6.26/defconfig-collie index e21cc21da2..e80885f332 100644 --- a/packages/linux/linux-rp-2.6.26/defconfig-collie +++ b/packages/linux/linux-rp-2.6.26/defconfig-collie @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.26 -# Fri Oct 17 18:46:51 2008 +# Mon Oct 20 01:48:37 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -845,7 +845,13 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set # CONFIG_TOUCHSCREEN_TOUCHWIN is not set # CONFIG_TOUCHSCREEN_UCB1400 is not set +# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set CONFIG_INPUT_MISC=y +# 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_UINPUT=m # @@ -954,11 +960,11 @@ CONFIG_SSB_POSSIBLE=y # # Multimedia Capabilities Port drivers # -CONFIG_MCP=m -CONFIG_MCP_SA11X0=m -CONFIG_MCP_UCB1200=m +CONFIG_MCP=y +CONFIG_MCP_SA11X0=y +CONFIG_MCP_UCB1200=y # CONFIG_MCP_UCB1200_TS is not set -CONFIG_MCP_COLLIE_TS=m +CONFIG_MCP_COLLIE_TS=y # # Multimedia devices @@ -1044,7 +1050,47 @@ CONFIG_FONT_8x8=y # CONFIG_SOUND is not set # CONFIG_HID_SUPPORT is not set CONFIG_HID=m -# CONFIG_USB_SUPPORT is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +# CONFIG_USB_ARCH_HAS_OHCI is not set +# CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set + +# +# NOTE: USB_STORAGE enables S |