diff options
Diffstat (limited to 'conf')
36 files changed, 511 insertions, 251 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 9e10e7405f..123d9ce7a7 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -107,7 +107,18 @@ DATETIME = "${DATE}${TIME}" # python-native should be here but python relies on building # its own in staging -ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-native python-native-runtime perl-native-runtime texinfo-native util-linux-native" +ASSUME_PROVIDED = "\ + bc-native \ + bzip2-native \ + cvs-native \ + diffstat-native \ + patch-native \ + perl-native-runtime \ + python-native-runtime \ + svn-native \ + texinfo-native \ + util-linux-native \ + " ################################################################## # Package default variables. @@ -118,6 +129,8 @@ PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1] or '1. PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}" PF = "${PN}-${EXTENDPE}${PV}-${PR}" EXTENDPE = "${@['','${PE\x7d_'][bb.data.getVar('PE',d,1) > 0]}" +EXTENDPEVER = "${@['','${PE\x7d:'][bb.data.getVar('PE',d,1) > 0]}" +DEBPV = "${EXTENDPEVER}${PV}-${PR}" P = "${PN}-${PV}" # Package info. @@ -163,14 +176,14 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal" SECTION_${PN}-dev = "devel" ALLOW_EMPTY_${PN}-dev = "1" -RDEPENDS_${PN}-dev = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}" +RDEPENDS_${PN}-dev = "${@['', '${PN} (= ${DEBPV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}" FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \ ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug ${libdir}/${PN}/.debug \ ${libdir}/matchbox-panel/.debug" SECTION_${PN}-dbg = "devel" ALLOW_EMPTY_${PN}-dbg = "1" -RRECOMMENDS_${PN}-dbg = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}" +RRECOMMENDS_${PN}-dbg = "${@['', '${PN} (= ${DEBPV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}" FILES_${PN}-locale = "${datadir}/locale" @@ -252,7 +265,7 @@ IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}" IMAGE_CMD = "" IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}" -IMAGE_CMD_yaffs2 = "mkyaffs2image 1 ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.yaffs2 ${EXTRA_IMAGECMD}" +IMAGE_CMD_yaffs2 = "mkyaffs2image ${EXTRA_IMAGECMD} ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.yaffs2" IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}" IMAGE_CMD_ext2 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}" IMAGE_CMD_ext2.gz = "rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz" @@ -268,7 +281,7 @@ IMAGE_CMD_cpio.gz = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | gzip -c - EXTRA_IMAGECMD = "" EXTRA_IMAGECMD_jffs2 = "" -EXTRA_IMAGECMD_yaffs2 = "" +EXTRA_IMAGECMD_yaffs2 = "1" EXTRA_IMAGECMD_squashfs = "" EXTRA_IMAGECMD_squashfs-lzma = "" @@ -291,19 +304,20 @@ EXTRA_IMAGEDEPENDS = "" CROSS_DIR = "${TMPDIR}/cross" CROSS_DATADIR = "${CROSS_DIR}/share" -export PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/bin:" +export PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${layout_sbindir}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/bin:${STAGING_DIR_NATIVE}${layout_base_sbindir}:" ################################################################## # Build utility info. ################################################################## CCACHE = "${@bb.which(bb.data.getVar('PATH', d), 'ccache') and 'ccache '}" +TOOLCHAIN_OPTIONS = "" -export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" -export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}" -export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}" -export CPP = "${HOST_PREFIX}gcc -E" -export LD = "${HOST_PREFIX}ld" +export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" +export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" +export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" +export CPP = "${HOST_PREFIX}gcc -E${TOOLCHAIN_OPTIONS}" +export LD = "${HOST_PREFIX}ld${TOOLCHAIN_OPTIONS}" export CCLD = "${CC}" export AR = "${HOST_PREFIX}ar" export AS = "${HOST_PREFIX}as" @@ -441,15 +455,16 @@ SRC_URI = "file://${FILE}" ################################################################## SHELLRCCMD = "bash --rcfile $TERMRCFILE" +export SHELLCMDS = "${SHELLRCCMD}" # Some common terminal programs to choose from GNOME_TERMCMD = 'gnome-terminal --disable-factory -t "$TERMWINDOWTITLE"' -GNOME_TERMCMDRUN = '${GNOME_TERMCMD} -x ${SHELLRCCMD}' +GNOME_TERMCMDRUN = '${GNOME_TERMCMD} -x $SHELLCMDS' SCREEN_TERMCMD = 'screen -D -m -t "$TERMWINDOWTITLE"' -SCREEN_TERMCMDRUN = '${SCREEN_TERMCMD} ${SHELLRCCMD}' +SCREEN_TERMCMDRUN = '${SCREEN_TERMCMD} $SHELLCMDS' XTERM_TERMCMD = 'xterm -T "$TERMWINDOWTITLE"' -XTERM_TERMCMDRUN = '${XTERM_TERMCMD} -e ${SHELLRCCMD}' +XTERM_TERMCMDRUN = '${XTERM_TERMCMD} -e $SHELLCMDS' KONSOLE_TERMCMD = 'konsole -T "$TERMWINDOWTITLE"' -KONSOLE_TERMCMDRUN = '${KCONSOLE_TERMCMD} -e ${SHELLRCCMD}' +KONSOLE_TERMCMDRUN = '${KONSOLE_TERMCMD} -e $SHELLCMDS' # Set a default TERMCMD ?= "${GNOME_TERMCMD}" diff --git a/conf/checksums.ini b/conf/checksums.ini index 19ffcdb42e..afa2a95e2b 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -322,6 +322,10 @@ sha256=325fdc7351a08bd8d811e7fb53c41bff11764648ab1a671abd910afec946b38a md5=44c2226eff0f3fc1f2fedaa1ce596533 sha256=0b2245250d5e800d1b6b6a2c5ca9e697052cae00833bf90ca0488f5bffd38477 +[http://www.python.org/ftp/python/2.5.1/Python-2.5.1.tar.bz2] +md5=70084ffa561660f07de466c2c8c4842d +sha256=d0b5d4dce02c56d2eb0728db3ebd63afc3dae906d158be6532ae4480d311e167 + [http://jerakeen.org/files/PythonDaap-0.4.tar.gz] md5=f7672bfd563787a76fb7e9a43c062f18 sha256=5318946df77937e0b601c95a198790f9ba52d4afb4eb153480289350182bb739 @@ -886,6 +890,10 @@ sha256=2cb6a15a9fff56c0d24f3a95b7f67c52436a88716e640c7f7afd48c9a5cbd740 md5=6acdff79afa2631f765f3bbbc3e25a74 sha256=89ae5fd08018679b80cee201e1c1350d86db73bdcf6718aabb4bd3ea86f93ec9 +[http://avahi.org/download/avahi-0.6.21.tar.gz] +md5=9cc68f79c50c9dd9e419990c3c9b05b9 +sha256=d817c35f43011861476eab02eea14edd123b2bc58b4408d9d9b69b0c39252561 + [http://downloads.sourceforge.net/avetanabt/avetanaBluetooth-20060413.tgz] md5=3cb3be404950ef08e51adbe59c7b811e sha256=c3648f02dd7d4dc8c0ef9a48089fda4ca47b81a977c838b17f55e6abf7f51447 @@ -1098,6 +1106,10 @@ sha256=00dbb7513115d2fcdb7ca3bd777e4bc38e5ed80964fec2d1454e4acadc950094 md5=9e091f2ce00b906c4c456fff24e69e55 sha256=fe6de9ccfab9e9fbdbe1a2cbe4a9ea771d1a2efc7f2122a2350214394587ff39 +[http://bluez.sourceforge.net/download/bluez-libs-3.20.tar.gz] +md5=9d7e02ea9a4c43d8f030500f282ee8bf +sha256=cf37ac1eb3ec0c473e527f11f068fc5fcc7452d688acc89a0e52553f51fc36bb + [http://bluez.sourceforge.net/download/bluez-libs-3.4.tar.gz] md5=8b73b0ccbcef6a4270468487b1309990 sha256=6c40f8b2dcf9359cc7f6afa803fc5744652c1d95669c134b975758a8748a87e8 @@ -1118,6 +1130,10 @@ sha256=8e722a732f53c070ad68b7a70f8e9568eeb186558af68334571917a11f40cb0e md5=2b6b4d519b8f75ef3990122934e660ba sha256=f8f242c6835ae826bf1f4eaee6c50d47d6208715e45450ba42c1769094c3f296 +[http://bluez.sourceforge.net/download/bluez-utils-3.20.tar.gz] +md5=ef596746d656ed034ed64596f72ef3c2 +sha256=5ed4245e31fa43789a3090d02a25ed90eaee95819cce30cda59d4d09f4fc0db0 + [http://bluez.sourceforge.net/download/bluez-utils-3.4.tar.gz] md5=f63b440396baee7dee9259395a205d48 sha256=44a50104072a39e4f941ab68b6ffce5feb2fec7a94f3dd32f0945939d09eca39 @@ -1206,6 +1222,10 @@ sha256=49020d3cc60b58a95fc94b5333c3c4a3b630c82287b08a3a94ad5a74cfe7bd75 md5=2cab42847c4654e58c4d0ba114bfe2c2 sha256=3fd05b5b77b9913b93036b48ed28d23d794e67660ba2d2ad63b0b7701b22181d +[http://downloads.sourceforge.net/bridge/bridge-utils-1.2.tar.gz] +md5=1e6cff57ac90d7ab984d9512fdd9f2dd +sha256=c93b9fab6b12a80bcf69114aab66d1d298455e9269c44f9e5f6430c142f9e349 + [http://www.holtmann.org/linux/bluetooth/bt950-0.1.tar.gz] md5=41d6a2dfe88693b5ec999d9ae4e97aac sha256=e3ff9a7f6dead90d55f1a4a2b1277e3bf5f0ec44ccb6ba8f375acbbedb1263c1 @@ -1678,6 +1698,10 @@ sha256=fc8dcda5a933c370c15c832bf1e7316a0690f473fdd6000454d233edaa33bc23 md5=37a1de15c4300ca9413d39d2bcea9b36 sha256=2e833e81d43f6294e5bd0d1776d68bd147bdab31e86c7544dc1462e44db9bfa2 +[http://curl.haxx.se/download/curl-7.16.4.tar.bz2] +md5=ffa6d1f4e28ca493a43f9dc17882c4d8 +sha256=45c69529126b6ff50e7ebe2c2b8157a4ecb405174a1349234903021e9ac5c87b + [http://www.blackie.dk/Zaurus/custominput/custominput-1.1.0.tgz] md5=7a0f97339a1caed5695715581306b83e sha256=9af88287720701691b58ee13898d248dd9afc63d9c593eb79c1149cc2a7f4e92 @@ -1818,6 +1842,14 @@ sha256=d0fbedef20fb0843318d60551023631176b27ceb1e11de7468a971770d0e048d md5=2f8c073084c27d0df40e747eda7f79ba sha256=22b1f489afef6849919220591ffc51615b9cddbea61b66b43791fdeebb4dbe09 +[http://downloads.sourceforge.net/dejavu/dejavu-ttf-2.18.tar.bz2] +md5=78012718a15d43e2c4952db7409c9e7e +sha256=792776053c5842c4335d3f17d9f0c789063ad34c4fc0e2ccabbdefbd84f14726 + +[http://freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.14.tar.gz] +md5=e0b5057a4e3166f34635ac6f27c712c0 +sha256=97856d2621d4e3273340b7f1172c2e074c74263629b05bde0f0f077425ec0699 + [http://freedesktop.org/Software/desktop-file-utils/releases/desktop-file-utils-0.3.tar.gz] md5=40a93def0f37f1577c5edc638fcb35a5 sha256=6e932e73818697ea9ec8909bed535a87ba34651031bbbedb63a42e4cdc423284 @@ -2454,6 +2486,10 @@ sha256=5090d5123ea642842d04d3f93a821e1372e5d9e434c74c08ee2483cc150a6273 md5=402bdb26356791bd5d277099adacc006 sha256=c0810fb3ddb6cb73c9ff045965e542af6e3eaa7f2995b3037181766d26d5e6e7 +[ftp://ftp.fi.debian.org/pub/gentoo/distfiles/file-4.21.tar.gz] +md5=9e3503116f4269a1be70220ee2234b0e +sha256=6f5644d56cc603138533158076a6cb41cd33c33d27e5310cb76cb6576151ca67 + [http://ftp.gnome.org/pub/gnome/sources/file-roller/2.6/file-roller-2.6.1.tar.gz] md5=68a1b645b2e44227f7aca604fd42f8d1 sha256=21e68eeb291ab5a9f4d618f2985c16c26cdfeb0f0f37d3b88550446678dab30a @@ -3142,6 +3178,10 @@ sha256=7f55ec02b5ab9e86c64f5718be64854fd9c64899908e580e1a9759421ac3b436 md5=c4f72d96f62ae97c6e8d5cdb4afd55ca sha256=907138a7537ff8cef5a9bb258cbba3e32fa46b240f66cd16d5bf530e081ac6b9 +[http://www.kernel.org/pub/software/scm/git/git-1.5.2.3.tar.bz2] +md5=8bb8995f098826154178d5f2d926b6c6 +sha256=d7a92ec68849cc8b333f10263ea3c9c19ccc99fe9b581b5769fb729b14ac54ac + [http://www.kernel.org/pub/software/scm/git/git-1.5.3.tar.bz2] md5=798e5784670e0a3e0daaea048e60851d sha256=aeef281072cf3e045b73e7047bd9830a71128b828920b3d389a5b7b7cbd0beff @@ -3906,6 +3946,10 @@ sha256=14fb095d231343a576da5e8aa7807b09cd7bde2df59a5a569495dc03a434d178 md5=875ed73f43584cd3ece4a7ac28dd692a sha256=a7ec60003a96975523598c2ef5f2927c9a362e689e7159b268c7fe431754635a +[http://gpe.linuxtogo.org/download/source/gpe-scap-1.3.tar.bz2] +md5=7ba3d2592585c8bcf9d3bf1aafeefef3 +sha256=609e24aa1413b1053ee3fd42c36c6ccf05d8067867021511c7d50d4829875b44 + [http://gpe.linuxtogo.org/download/source/gpe-session-scripts-0.67.tar.gz] md5=774c64ed54455f1297ecbeeffdc52eed sha256=da051f5049d44415fff02b48368db4e3e3b6154135a50f990844d73896d18e19 @@ -5722,10 +5766,6 @@ sha256=494636571ae72af7524c3a7703324ef68dbf755f753054317489fe79ac895ae0 md5=bdcdb1b8ca13dba897c0a2138d1643f5 sha256=694ea8352edf845b0a7dc0c2e0e990bcb8507f64e405edc048ad115c6578e5f7 -[http://gpephone.linuxtogo.org/download/gpephone/libabenabler-0.1/libabenabler-0.1.tar.bz2] -md5=49fe67302fd76543a7574a73c01395ba -sha256=512674419ac2013d11eccf4f106d6cfc719c9c2b49215a8f0e89c5327d176a84 - [http://search.belnet.be/packages/lineox/4.0/updates/SRPMS/libaio-0.3.103-3.src.rpm] md5=3d6ca28cb7cf73ca1d9fe902924bdc84 sha256=9f578643db9fff6ae088a492e6a4aca3cac4c2cbc51afce551687f4f0d36465f @@ -5850,6 +5890,10 @@ sha256=9aa09bb2de91727de68ee57b1a1e4c03059cbbc7166f9f181ee8b5c2792e724d md5=6812a5e4063b5016f25e9a0cebbd3dd9 sha256=83004489cce844d4f9180fb74cc4781bb79e31aecf60d529608a510cf114484e +[http://0pointer.de/lennart/projects/libdaemon/libdaemon-0.11.tar.gz] +md5=b99a608ae9a762e809b667bfa20d86dd +sha256=d54efe38aad450363c46eaa32b1bf29cbd3b7f8c870c0ffcaec8891c22681eb0 + [http://0pointer.de/lennart/projects/libdaemon/libdaemon-0.12.tar.gz] md5=76596823cc1a6d1cdf7779b782ff0ee6 sha256=39e7c9f8644d1af310d076c1a5cc648040033e4724e7edfd85eb983ad88336d0 @@ -6226,6 +6270,10 @@ sha256=7baf0a33a717c5d5b24faf592ba16fc5e962f1537f46b11f6ed003010a8ff1e9 md5=aae34a35b00c547f2e41c747cf87f8b7 sha256=d815a1a5445fc26de5c7b10192acb77cf4277a100124842b616f85a5a4fbfe3b +[ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.4.tar.gz] +md5=86e60e9a03205fb706e99be101a2387e +sha256=fff67ec5ffc93cf91fc62350a19a9f677c9bc6eb2730395d22f9d40c754ed619 + [http://downloads.sourceforge.net/gphoto/libgphoto2-2.1.4.tar.bz2] md5=a201650482bbc2edbd948449cf4d3f5a sha256=98af9747179c4d284104fc155b624c6cda4e91a554de0a04e6a6878c0e852c63 @@ -6302,10 +6350,6 @@ sha256=383e0a22a537f653b8d41688277560f95678a042967198085ec7caa1a5cc2f4c md5=2f0882a711759113b2388a790abe8fd8 sha256=68dd467cf8bd54283da874af54ac35de58b88444371ea48bb5cef289a0942981 -[http://gpephone.linuxtogo.org/download/gpephone/libiac-0.1/libiac-0.1.tar.bz2] -md5=cf829bb82f84728194c64a41e9f1cf32 -sha256=10197df9daee806453c5a7e99e538d7eac0421796f2a9ae114d4369d85fcf3af - [ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.11.tar.gz] md5=b77a17e4a5a817100ad4b2613935055e sha256=fbf5b9a63ea6e3abebfabc04506f0e18a2860071031e34ea4ad4f450b8c43d4b @@ -6558,6 +6602,10 @@ sha256=f20d19b1f32e4ee465169ff1e17a3755bfda8c697cfed11fe36cbf6959c80441 md5=b0626ad59004fe5767ddd2ce743a2271 sha256=6a6568bc082c266864687674707628d1531e86cffad439af72b865ac3169c322 +[http://www.tcpdump.org/release/libpcap-0.9.6.tar.gz] +md5=2e1b5e983654c1d5991450e3e0e525ca +sha256=cac67ef8837a2bdd20d7fb5e990e233d80a9ff398cf08a62bb7fac068a419b3e + [http://www.xmailserver.org/libpcl-1.4.tar.gz] md5=6d63c462911349de80109c0161ed6d37 sha256=3c64155a9218c0367f3b0afd4bd8a4a46cc467ad6c85e98952a4ef517b183686 @@ -6578,6 +6626,10 @@ sha256=7d06103ce32bffa39730d1c12c4b4dcfd50a8f1c18d2462807cfe7c0c3ca0e64 md5=7a1ca4f49bcffdec60d50f48460642bd sha256=3a14200862cf4fe59fd66340364537d9973b032b7831b7fe33eb827baebc0019 +[http://downloads.sourceforge.net/libpng/libpng-1.2.20.tar.bz2] +md5=8c186d9da3d011e2c3076b28f9c6be7b +sha256=f5e1037be2cb2a47a7f50181a42fac289a662e78d0ec4c68971f557d5451b8c2 + [http://downloads.sourceforge.net/libpng/libpng-1.2.8.tar.bz2] md5=00cea4539bea4bd34cbf8b82ff9589cd sha256=9bec729a1e77d8bbc5800b14aa81f09290aa18daa40f344103f2c0d1d681531b @@ -6710,6 +6762,10 @@ sha256=d98203f017c6e1de7dca2037c533000705fc86b12f29694ddb4db17854e5498a md5=5fe69ba13bf35d505b733247032a8a64 sha256=222803a98d1e86ac7eee9491beb5fbf30e259a3c74cd4166bda1796374c26cd1 +[http://downloads.sourceforge.net/libspiff/libspiff-0.7.2.tar.bz2] +md5=3b291762e0149c975dab9f5ea15bad15 +sha256=6b498c1070e17f665625dc3e5113e8af55da5ce3d4d5abf0ae3fec344b8208d4 + [http://www.0xbadc0de.be/libssh/libssh-0.11.tgz] md5=ad703c4702646c83ca4fcace92c220d3 sha256=94ca32ac10615a7c0ba19180e67f2e40e2bfa4cc8de6ceb2a3a54d2dd83141cb @@ -6810,6 +6866,10 @@ sha256=d03295e5cb22ed7d086ce1ce754c498ed6bc2388c45e4547417d922580d3cd7c md5=f7aad7b8dad79b38d3055d84c3838e2c sha256=e881c527398904f450f3983dcebb71094b5f558f823fe57d0af5a4c1fa6f6f7f +[http://ftp.gnome.org/pub/GNOME/sources/libwnck/2.13/libwnck-2.13.5.tar.bz2] +md5=cb2da2795f517c713ec98560d078a102 +sha256=ce959b7349de056205e992b05c9c914994bc269d2b1d02de85eacd398263aab6 + [http://ftp.gnome.org/pub/GNOME/sources/libwnck/2.8/libwnck-2.8.1.tar.bz2] md5=c0a5a8478064287e167c15e3ec0e82a1 sha256=e9d15538a0bb97f6a440b23a5b372c41387773065dac69cab9fd1dc1d22a432b @@ -6946,6 +7006,10 @@ sha256=d337faebd64ddb8c52cde23df8469e1b3c65545af5f939e9bb4be9eeb9658c8a md5=4ea2dc22a23bf2aa570f868aa86357f8 sha256=ce92f00031c885e04cb65ea76c4675b07aa98af9607572fb0d68180c34bf5346 +[ftp://xmlsoft.org/libxml2/libxslt-1.1.21.tar.gz] +md5=59fe34e85692f71df2a38c2ee291b3ca +sha256=ccefd4ceb29bb729dcaa9a9d4a86654a9134adfd29bdd72be1a9d3726efb54e0 + [http://www.lighttpd.net/download/lighttpd-1.4.13.tar.gz] md5=d775d6478391b95d841a1018c8db0b95 sha256=62d5997fdb41afa9400adcdb040d04a1f5fa950045df96e3e3f593e8f0de5739 @@ -7506,6 +7570,10 @@ sha256=f54035309b2a4d45a90979c2b56ab2488546826862062bfc22cd7e7ed8b5ebf6 md5=42187ec7b3db21ba237a3a2858bf9acd sha256=fdf06c44ff8d7bc1d1a33d890e1dad8962d2a83c4521abce8381b6d1a4429cf2 +[http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.2/matchbox-window-manager-1.2.tar.bz2] +md5=3e158dcf57823b55c926d95b245500fb +sha256=81a23a4af797cf350759fd5ac738797015a66dd5dba2f3d9f3c6908506c1ceff + [http://openembedded.org/dl/matrixssl-1-1-1.tar.gz] md5=0f867a7b5ce70650f36caf00c4941ebf sha256=b46ade42d080851ba4c5a10d3c520eb169fc33ab5c259ee8ca147eff57741246 @@ -8066,6 +8134,10 @@ sha256=83a15eb99bb7a895d52e31be1c1548789a8bc29e83d30e758cf034a6627a1184 md5=a5a9aa63205e624da8468e35722b08bf sha256=a187976c1957a7a0e17014ed97cbb4341f6898d5f60301f1b0c37e52188ebd13 +[http://www.galago-project.org/files/releases/source/notification-daemon/notification-daemon-0.3.7.tar.gz] +md5=7fa369bff1031acbe4ca41f03bee7d02 +sha256=53d2f92c3d14423b49c2ff077855cf3987d38def963c82fd26fba5de379ca540 + [http://hauppauge.lightpath.net/de/nova-pci218c.exe] md5=139a1ed50a1a12e47b1f7deedf4f40c3 sha256=4310a3a526ae5461e17f57353fc29f71d13820a215eaa62c629190cc2a026173 @@ -8206,6 +8278,10 @@ sha256=5adb9b2c2002650e15216bf94ed9db9541d9a17c96fcd876784861a8890bc92b md5=7e9880ac20a9b9db0d3fea30a9ff3d46 sha256=4ba757d6c933e7d075b6424124d92d197eb5d91e4a58794596b67f5f0ca21d4f +[ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-4.6p1.tar.gz] +md5=6a7fa99f44d9e1b5b04d15256e1405bb +sha256=7bbe277faa80c8d8d9cb96111db65fc0007d451784cc459207cd46b746a6f23a + [http://www.openssl.org/source/openssl-0.9.7e.tar.gz] md5=a8777164bca38d84e5eb2b1535223474 sha256=25121b5dbd2b830929519325e033086ce45861cff2d0000d928f48261b1e0b7c @@ -9370,7 +9446,7 @@ sha256=abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 md5=9519eccf0638c9962f73a7b20da77e0e sha256=8fdbc7da376b22796879d6e3b756f71a8800ed1b35fc88aa76cddffd6f1fd883 -[ftp://ftp.trolltech.com/pub/qt/source/qtopia-core-opensource-src-4.3.2.tar.gz] +[ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.3.2.tar.gz] md5=70b729dd5dd8b2b432d685918e1971f1 sha256=38af7b39e7805d8e3ba81091aa29af8bd38ce7cbbf8e721c8bb7ab810c38d963 @@ -10094,6 +10170,10 @@ sha256=e81d1176960a14459f9ff492b2c4fb1e2b55d0b2c82fd225dbc37afd02334256 md5=2feec9b429f9298c9f288420c8b449f8 sha256=0ad86c4b26cd687122b158bf848f0a07d7cd644033d15c4f43b6d643bd74cd81 +[http://www.sqlite.org/sqlite-3.5.2.tar.gz] +md5=b4f631268d811189cfca1d5259cb5dd8 +sha256=af0b4ca361435e54316ddf715737b5b94c737c41e3c0b0e6d66ee8a8938f4500 + [http://downloads.sourceforge.net/squashfs/squashfs2.0-r2.tar.gz] md5=0b7fcaab8e634ae2385984885c731082 sha256=353b768294783959219f1203e76c128fb4c75fa37f3a3bb139603c5db55c6974 @@ -10342,6 +10422,10 @@ sha256=9543d7adedf78a6de0b221ccbbd1952e08b5138717f4ade814039bb489a4315d md5=26c2f6405d6a94f1160a83109b2f71dd sha256=d701a3e4d7ab296fecdd6f8f84610a3c6d275839f9db4269b1ff7db3e0a9c0e5 +[http://www.tcpdump.org/release/tcpdump-3.9.7.tar.gz] +md5=2aacf4dc9a3bc500a8b4f3887a32cdd5 +sha256=09f1daece22a3555f1ca1f9779caf36357cc8d5b9ad1964606093c7e884e0da4 + [http://downloads.sourceforge.net/tcpick/tcpick-0.1.22.tar.gz] md5=77b991a686e83cb716fd241aaa6ea432 sha256=db19142fd2ca6218ead04fb3144b1640e2ad5a1c784a4e790c8816a37a79ac2e @@ -10386,6 +10470,10 @@ sha256=1c76d6ac7e80de0ae88cc5cbdad7a2a564eac96788549359b001366dc52fe817 md5=e7b056a7619cdd460b5db5a7e263cafc sha256=cf7becd610e298d23780216f474907745bd29484f7f81308a9d13cf07f2a4e2d +[http://www.catb.org/~esr/terminfo/termtypes.tc.gz] +md5=37318885db65314f1bcc2b22751123d3 +sha256=c4fa04257fea6e968d4caa28cc18dbbf9eea4769a463296eaca21ceea757a728 + [http://downloads.sourceforge.net/tesseract-ocr/tesseract-1.0.tar.gz] md5=e3bc57773a60134ef37e9f06fe541108 sha256=6fc9e28a574bf22028249e9a12e033c8bee0aeccbf90621238a6f538e60e7d60 @@ -10710,6 +10798,10 @@ sha256=e42ac3b45c1c8a3199bbd9b666e9225d76bc18d902339c54cbb4df3a75909e53 md5=9002b1bc2de9285588dd97b618a867a7 sha256=bdb715784bf0c94825cf40f97c60a5ec83fd3e17e9e186a78cd145781c4d9804 +[http://downloads.sourceforge.net/uriparser/uriparser-0.5.1.tar.bz2] +md5=faf561c6260e1b580cba2509f410a29f +sha256=5a664f5c8f404c1148f661499866f1fe8df8debef2adc55c630ac83e6d57a98c + [http://excess.org/urwid/urwid-0.8.4.tar.gz] md5=4bf9e297f1db0502ec2753f3e084f4cd sha256=03c1970273b211be8a6a8d23e44522b5d20a774781d31b51c26109985ac28cdd @@ -10790,7 +10882,7 @@ sha256=e95a45db65b33be472a3134492e348c4cd6edc200d02a85654ffe62bc2e6fdcd md5=6ce5a6e85653afdd10c48b89b4bcc8aa sha256=cef1e438a2f936efe00ffbb3758c80de72ed514f210e067cb8469a8b00b8feb4 -[http://ftp.debian.org/debian/pool/main/u/uucp/uucp_1.07.orig.tar.gz] +[ftp://ftp.gnu.org/pub/gnu/uucp/uucp-1.07.tar.gz] md5=64c54d43787339a7cced48390eb3e1d0 sha256=060c15bfba6cfd1171ad81f782789032113e199a5aded8f8e0c1c5bd1385b62c @@ -12434,6 +12526,10 @@ sha256=c45176d002c85c142ac52774680f5325d330c5ecc32d4d6a056d85ee039a0cbc md5=977ee3fd1525418aaa8bfc55ffbf6fc9 sha256=f3c25042dfd332c3aee22176b3bcd244a99bc475112a97d9d4cc03505fe7b48f +[http://xorg.freedesktop.org/releases/individual/app/xrandr-1.2.0.tar.bz2] +md5=9e74e6919cf731ec10ce26fd6a4483fa +sha256=7bf3bd3cf46a6a29e35b9dd1c8d3d14494be76da0d24c6ef5dab36974445004d + [http://xorg.freedesktop.org/releases/individual/app/xrandr-1.2.2.tar.bz2] md5=c6ec9dc42396e3b3a2da932f3feca6ec sha256=632f3ff492a07f8279807ffbafe4f89af069bb0e7b4934b3ddf7379509aa9303 @@ -12466,6 +12562,10 @@ sha256=9915ee47ff85d83eee825b1a44857b92b4b16558e4bf436671ae7a37f4ab65ad md5=16df4b8f3d844236dfd24efd88e8ea99 sha256=964f96d9d86140564fa42de6f803bf3065ef287620cec4462d2fae8ca396034b +[http://projects.o-hand.com/sources/xrestop/xrestop-0.4.tar.gz] +md5=d8a54596cbaf037e62b80c4585a3ca9b +sha256=67c2fc94a7ecedbaae0d1837e82e93d1d98f4a6d759828860e552119af3ce257 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xrx-X11R7.0-1.0.1.tar.bz2] md5=9de3b04392c98df59c79a34fd51c385f sha256=2a177a9f36c92fdc109260a7c04980db6920fb9d3529d79e9bc019ae7f5a310e @@ -12782,7 +12882,3 @@ sha256=12f5b654f6b91953391d2492a09d2c9586d5b7af419f0eeb306e1d30245659d3 md5=a6538f6c44ceeed0ed7e8e356f444168 sha256=f684397ce39ec400ba3369521892b7c3a8711d3ef1be59115db9f8d57707bbb8 -[http://projects.o-hand.com/sources/xrestop/xrestop-0.4.tar.gz] -md5=d8a54596cbaf037e62b80c4585a3ca9b -sha256=67c2fc94a7ecedbaae0d1837e82e93d1d98f4a6d759828860e552119af3ce257 - diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index fe6be3e614..4c9a254cd9 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -2,7 +2,7 @@ #@TYPE: Distribution #@NAME: Angstrom <http://www.angstrom-distribution.org> #@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices -#@MAINTAINER: Koen Kooi <koen@dominion.kabel.utwente.nl> +#@MAINTAINER: Koen Kooi <koen@openembedded.org> #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de> #@-------------------------------------------------------------------- @@ -14,7 +14,7 @@ require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc #Images built can have to modes: -# 'debug': empty rootpassword, strace and gdb included +# 'debug': empty rootpassword, strace included # 'release' no root password, no strace and gdb by default DISTRO_TYPE ?= "debug" #DISTRO_TYPE = "release" @@ -29,18 +29,24 @@ DISTRO_TYPE ?= "debug" # Also, it appears that no locales fit in 16Mb for now. "C" locale rules! IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}' -FEED_URIS += " \ - no-arch##${ANGSTROM_URI}/unstable/feed/all \ - base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \ - perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \ - python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \ - debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \ - gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \ - ${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}" +# These will be put under package management soon +#FEED_URIS += " \ +# no-arch##${ANGSTROM_URI}/unstable/feed/all \ +# base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \ +# perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \ +# python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \ +# debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \ +# gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \ +# ${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}" # base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/base \ # ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/machine/${MACHINE} \ # updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/updates" + +# set feed path variables +FEED_BASEPATH = "feeds/2007/${ANGSTROM_PKG_FORMAT}/${ANGSTROM_MODE}/" + + #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback CVS_TARBALL_STASH ?= "\ http://www.angstrom-distribution.org/unstable/sources/ \ @@ -54,29 +60,12 @@ MACHINE_KERNEL_VERSION = "2.6" PCMCIA_MANAGER = "pcmciautils" #Preferred version for the kernel on various machines -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh17" +PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh19" +PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}" RDEPENDS_kernel-base_hx4700 = "" RDEPENDS_kernel-base_htcuniversal = "" -# Needed for crappy ipaqs with broken hostap in the kernel -PREFERRED_VERSION_hostap-modules ?= "0.4.7" -PREFERRED_VERSION_hostap-utils ?= "0.4.7" - -PREFERRED_VERSION_file = "4.18" -PREFERRED_VERSION_file_native = "4.18" - -PREFERRED_VERSION_fontconfig = "2.4.1" -PREFERRED_VERSION_freetype = "2.3.4" -PREFERRED_VERSION_freetype-native = "2.2.1" -PREFERRED_VERSION_cairo = "1.4.10" -PREFERRED_VERSION_glib-2.0 = "2.12.12" -PREFERRED_VERSION_pango = "1.16.4" -PREFERRED_VERSION_atk = "1.20.0" -PREFERRED_VERSION_gtk+ = "2.10.14" - -# newer poppler cvs breaks some apps, fix until popper 6 and apps -# catch up with api changes -# PREFERRED_VERSION_poppler = "0.5.4" +PREFERRED_PROVIDER_libgsmd = "libgsmd" # older gtk-webcore releases don't work on ARM/EABI # We need to switch to a fixed SRCDATE or release as soon as possible @@ -91,14 +80,6 @@ PREFERRED_PROVIDER_avahi = "avahi" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" -PREFERRED_VERSION_xserver-kdrive ?= "1.3.0.0" -PREFERRED_VERSION_libxrandr ?= "1.2.1" -PREFERRED_VERSION_xrandr ?= "1.2.0" -PREFERRED_VERSION_randrproto ?= "1.2.1" - -PREFERRED_VERSION_libgnomeui = "2.18.1" -PREFERRED_VERSION_prismstumbler = "0.7.3" - #use EABI ready toolchain PREFERRED_VERSION_gcc ?= "4.1.2" PREFERRED_VERSION_gcc-cross ?= "4.1.2" @@ -110,6 +91,16 @@ PREFERRED_VERSION_gcc-cross_dht-walnut ?= "4.1.1" PREFERRED_VERSION_gcc-cross-sdk_dht-walnut ?= "4.1.1" PREFERRED_VERSION_gcc-cross-initial_dht-walnut ?= "4.1.1" +PREFERRED_VERSION_gcc_xilinx-ml403 ?= "4.1.1" +PREFERRED_VERSION_gcc-cross_xilinx-ml403 ?= "4.1.1" +PREFERRED_VERSION_gcc-cross-sdk_xilinx-ml403 ?= "4.1.1" +PREFERRED_VERSION_gcc-cross-initial_xilinx-ml403 ?= "4.1.1" + +PREFERRED_VERSION_gcc_mpc8323e-rdb ?= "4.1.1" +PREFERRED_VERSION_gcc-cross_mpc8323e-rdb ?= "4.1.1" +PREFERRED_VERSION_gcc-cross-sdk_mpc8323e-rdb ?= "4.1.1" +PREFERRED_VERSION_gcc-cross-initial_mpc8323e-rdb ?= "4.1.1" + PREFERRED_VERSION_binutils ?= "2.18" PREFERRED_VERSION_binutils-cross ?= "2.18" PREFERRED_VERSION_binutils-cross-sdk ?= "2.18" @@ -149,21 +140,15 @@ PREFERRED_VERSION_glibc-initial ?= "2.5" # PREFERRED_VERSION_gcc-cross = "3.4.4+csl-arm-2005q3" # PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3" - -# Busybox <1.1.0 doesn't have EABI support -PREFERRED_VERSION_busybox = "1.2.1" - -PREFERRED_VERSION_dbus ?= "1.0.2" -PREFERRED_VERSION_dbus-glib ?= "0.74" - #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom +require conf/distro/include/preferred-xorg-versions.inc +require conf/distro/include/angstrom-2007-preferred-versions.inc require conf/distro/include/preferred-gpe-versions-2.8.inc require conf/distro/include/preferred-e-versions.inc -require conf/distro/include/preferred-xorg-versions.inc -require conf/distro/include/preferred-openmoko-versions.inc # Virtuals: +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" @@ -193,6 +178,7 @@ PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" # Others: +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" PREFERRED_PROVIDER_dbus-glib = "dbus-glib" PREFERRED_PROVIDER_esound ?= "pulseaudio" PREFERRED_PROVIDER_gconf ?= "gconf-dbus" @@ -225,10 +211,6 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" #Silence a warning during parsing PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" - -# Lock down almost every recipe: -require conf/distro/include/angstrom-2007-preferred-versions.inc - #This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH} ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" require conf/distro/include/angstrom${ARM_ABI}.inc @@ -237,7 +219,7 @@ require conf/distro/include/angstrom${ARM_ABI}.inc # We want to ship extra debug utils in the rootfs when doing a debug build DEBUG_APPS ?= "" -DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "tslib-tests tslib-calibrate gdb strace procps",d)}' +DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps",d)}' #this should go away soon EXTRA_STUFF ?= "" @@ -255,7 +237,7 @@ DISTRO_EXTRA_RDEPENDS += "\ update-modules \ ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \ angstrom-version \ - ipkg ipkg-collateral \ + ipkg ipkg-collateral ${ANGSTROM_FEED_CONFIGS} \ util-linux-mount util-linux-umount \ ${EXTRA_STUFF} \ ${DEBUG_APPS} \ diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 976ac38663..5d9f761a95 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -2,15 +2,10 @@ #@TYPE: Distribution #@NAME: Angstrom <http://www.angstrom-distribution.org> #@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices -#@MAINTAINER: Koen Kooi <koen@dominion.kabel.utwente.nl> +#@MAINTAINER: Koen Kooi <koen@openembedded.org> #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille-media.de> #@-------------------------------------------------------------------- - -# Use Xorg R7.3 release -require conf/distro/include/preferred-xorg-versions-X11R7.3.inc - - # This is a testbed for unstable and/or untested things, while angstrom-2007.1 # is aiming for stability and a release. # Use this at your own risk, we welcome bugreports filed at @@ -30,7 +25,7 @@ require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc #Images built can have to modes: -# 'debug': empty rootpassword, strace and gdb included +# 'debug': empty rootpassword, strace included # 'release' no root password, no strace and gdb by default DISTRO_TYPE ?= "debug" #DISTRO_TYPE = "release" @@ -54,6 +49,10 @@ FEED_URIS += " \ gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \ ${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}" +# set feed path variables +FEED_BASEPATH = "feeds/2008/${ANGSTROM_PKG_FORMAT}/${ANGSTROM_MODE}/" + + #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback CVS_TARBALL_STASH ?= "\ http://www.angstrom-distribution.org/unstable/sources/ \ @@ -67,19 +66,18 @@ MACHINE_KERNEL_VERSION = "2.6" PCMCIA_MANAGER = "pcmciautils" #Preferred version for the kernel on various machines -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh17" - -PREFERRED_VERSION_gcc = "4.2.1" -PREFERRED_VERSION_gcc-cross = "4.2.1" -PREFERRED_VERSION_gcc-cross-initial = "4.1.2" +PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh18" #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against -PREFERRED_VERSION_linux-libc-headers = "2.6.22" +PREFERRED_VERSION_linux-libc-headers = "2.6.23" #Prefer glibc 2.6 and uclibc 0.9.29, these have had the most testing. PREFERRED_VERSION_glibc = "2.6.1" PREFERRED_VERSION_glibc-intermediate = "2.6.1" PREFERRED_VERSION_glibc-initial = "2.6.1" +PREFERRED_VERSION_uclibc ?= "0.9.29" +PREFERRED_VERSION_uclibc-initial ?= "0.9.29" + #Prefer a newer GTK+ and friends PREFERRED_VERSION_gtk+ = "2.12.0" @@ -92,6 +90,21 @@ PREFERRED_VERSION_udev = "115" # Our patched-to-hell busybox 1.2.1 is getting old and unmaintanable PREFERRED_VERSION_busybox = "1.7.2" +PREFERRED_PROVIDER_avahi = "avahi" + +#Small machines prefer kdrive, but we might ship full Xorg in other images +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" +PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" + +PREFERRED_VERSION_gcc ?= "4.2.2" +PREFERRED_VERSION_gcc-cross ?= "4.2.2" +PREFERRED_VERSION_gcc-cross-sdk ?= "4.2.2" +PREFERRED_VERSION_gcc-cross-initial ?= "4.2.2" + +#Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom +require conf/distro/include/preferred-gpe-versions-2.8.inc +require conf/distro/include/preferred-e-versions.inc +require conf/distro/include/preferred-xorg-versions-X11R7.3.inc #avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE PREFERRED_VERSION_gcc_avr32 = "4.1.2" @@ -105,3 +118,96 @@ PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" PREFERRED_VERSION_uclibc_avr32 = "0.9.28" PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28" +# Virtuals: +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" + +#Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo) +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc-intermediate" + +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" +PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" + +# hostap stuff, we prefer the in-kernel modules, but those don't work for all machines +PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" +PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules" +PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules" + +PREFERRED_PROVIDER_virtual/db ?= "db" +PREFERRED_PROVIDER_virtual/db-native ?= "db-native" +PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" +PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" + +# Others: +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" +PREFERRED_PROVIDER_dbus-glib = "dbus-glib" +PREFERRED_PROVIDER_esound ?= "pulseaudio" +PREFERRED_PROVIDER_gconf ?= "gconf-dbus" +PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs" +PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs" +PREFERRED_PROVIDER_tslib ?= "tslib" +PREFERRED_PROVIDER_tslib-conf ?= "tslib" +PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" +PREFERRED_PROVIDER_ntp ?= "ntp" +PREFERRED_PROVIDER_hotplug = "udev" +PREFERRED_PROVIDER_libxss = "libxss" + +# we don't ship gtk-directfb by default +PREFERRED_PROVIDER_gtk+ ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" + + +#Silence a warning during parsing +PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" + +#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH} +ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" +require conf/distro/include/angstrom${ARM_ABI}.inc + +# do some task-base stuff here + +# We want to ship extra debug utils in the rootfs when doing a debug build +DEBUG_APPS ?= "" +DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps",d)}' + +# Angstrom want to ship some extra stuff. This should be moved into task-base eventually +# contains ipkg specific stuff as well :( +DISTRO_EXTRA_RDEPENDS += "\ + update-modules \ + ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \ + angstrom-version \ + ipkg ipkg-collateral \ + util-linux-mount util-linux-umount \ + ${DEBUG_APPS} \ + " + +DISTRO_EXTRA_RRECOMMENDS += " \ + kernel-module-vfat \ + kernel-module-ext2 \ + kernel-module-af-packet \ + avahi-daemon \ + avahi-autoipd \ + openssh-sftp-server \ + " diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index c3a8fcc9ec..72533c65e5 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -21,11 +21,11 @@ PREFERRED_VERSION_aircrack-ng ?= "0.9.1" PREFERRED_VERSION_albumshaper ?= "2.1" PREFERRED_VERSION_aliens ?= "1.0.0" PREFERRED_VERSION_aliens-qt ?= "1.0.0" -PREFERRED_VERSION_alsa-lib ?= "1.0.14" -PREFERRED_VERSION_alsa-oss ?= "1.0.14" +PREFERRED_VERSION_alsa-lib ?= "1.0.15" +PREFERRED_VERSION_alsa-oss ?= "1.0.15" PREFERRED_VERSION_alsa-plugins ?= "1.0.14" PREFERRED_VERSION_alsa-state ?= "0.1.0" -PREFERRED_VERSION_alsa-utils ?= "1.0.14" +PREFERRED_VERSION_alsa-utils ?= "1.0.15" PREFERRED_VERSION_anthy ?= "7811" PREFERRED_VERSION_anthy-native ?= "7811" PREFERRED_VERSION_antlr ?= "2.7.5" @@ -97,14 +97,14 @@ PREFERRED_VERSION_bison-native ?= "2.0" PREFERRED_VERSION_bitbake ?= "1.8.6" PREFERRED_VERSION_bitchx ?= "1.1" PREFERRED_VERSION_bluesnarfer ?= "0.1" -PREFERRED_VERSION_bluez-cups-backend ?= "3.20" +PREFERRED_VERSION_bluez-cups-backend ?= "3.22" PREFERRED_VERSION_bluez-dtl1-workaround ?= "1.0" PREFERRED_VERSION_bluez-gnome ?= "0.14" -PREFERRED_VERSION_bluez-gstreamer-plugin ?= "3.20" +PREFERRED_VERSION_bluez-gstreamer-plugin ?= "3.22" PREFERRED_VERSION_bluez-hcidump ?= "1.38" -PREFERRED_VERSION_bluez-libs ?= "3.20" -PREFERRED_VERSION_bluez-utils ?= "3.20" -PREFERRED_VERSION_bluez-utils-alsa ?= "3.20" +PREFERRED_VERSION_bluez-libs ?= "3.22" +PREFERRED_VERSION_bluez-utils ?= "3.22" +PREFERRED_VERSION_bluez-utils-alsa ?= "3.22" PREFERRED_VERSION_bmon ?= "2.1.0" PREFERRED_VERSION_boa ?= "0.94.13" PREFERRED_VERSION_bochs ?= "2.1" @@ -620,6 +620,7 @@ PREFERRED_VERSION_gst-plugins-good ?= "0.10.6" PREFERRED_VERSION_gst-plugins-ugly ?= "0.10.6" PREFERRED_VERSION_gstreamer ?= "0.10.14" PREFERRED_VERSION_gthumb ?= "2.6.9" +PREFERRED_VERSION_gtk+ ?= "2.10.14" PREFERRED_VERSION_gtk-clearlooks-engine ?= "0.6.2" PREFERRED_VERSION_gtk-doc ?= "1.0" PREFERRED_VERSION_gtk-doc-native ?= "1.0" @@ -652,7 +653,7 @@ PREFERRED_VERSION_gweled ?= "0.5" PREFERRED_VERSION_gxine ?= "0.4.1enhanced" PREFERRED_VERSION_gzip ?= "1.3.5" PREFERRED_VERSION_hal ?= "0.5.9" -PREFERRED_VERSION_hal-info ?= "20070618" +PREFERRED_VERSION_hal-info ?= "20070918+git" PREFERRED_VERSION_haserl ?= "0.8.0" PREFERRED_VERSION_havp ?= "0.86" PREFERRED_VERSION_hdparm ?= "6.9" @@ -661,7 +662,7 @@ PREFERRED_VERSION_hexatrolic ?= "1.0beta3" PREFERRED_VERSION_hfsplusutils ?= "1.0.4-4" PREFERRED_VERSION_hfsutils ?= "3.2.6" PREFERRED_VERSION_hibernate-script ?= "1.12" -PREFERRED_VERSION_hicolor-icon-theme ?= "0.9" +PREFERRED_VERSION_hicolor-icon-theme ?= "0.10" PREFERRED_VERSION_hiker ?= "0.9.1" PREFERRED_VERSION_hildon-base-lib ?= "0.11.1" PREFERRED_VERSION_hildon-control-panel ?= "0.9.1-1.2" @@ -675,8 +676,7 @@ PREFERRED_VERSION_hildon-status-bar ?= "0.8.11-1" PREFERRED_VERSION_hildon-thumbnail ?= "0.11" PREFERRED_VERSION_hostap-conf ?= "1.0" PREFERRED_VERSION_hostap-daemon ?= "0.4.4" -PREFERRED_VERSION_hostap-modules ?= "0.4.7" -PREFERRED_VERSION_hostap-utils ?= "0.4.0" +PREFERRED_VERSION_hostap-utils ?= "0.4.7" PREFERRED_VERSION_hotplug-dbus ?= "0.9" PREFERRED_VERSION_hotplug-ng ?= "002" PREFERRED_VERSION_hotplug-qcop ?= "cvs" @@ -776,7 +776,7 @@ PREFERRED_VERSION_keymap-locales ?= "1.0" PREFERRED_VERSION_keymaps ?= "1.0" PREFERRED_VERSION_keyring ?= "0.6.8" PREFERRED_VERSION_kf ?= "0.5.4.1" -PREFERRED_VERSION_kismet ?= "2007-01-R1b" +PREFERRED_VERSION_kismet ?= "2007-10-R1" PREFERRED_VERSION_klibc ?= "1.1.1" PREFERRED_VERSION_klimt ?= "0.6.1" PREFERRED_VERSION_knights ?= "1.14" @@ -1283,8 +1283,8 @@ PREFERRED_VERSION_mousepad ?= "0.2.12" PREFERRED_VERSION_mp3blaster ?= "3.2.3" PREFERRED_VERSION_mpc ?= "0.12.1" PREFERRED_VERSION_mpeg2dec ?= "0.4.0b" -PREFERRED_VERSION_mpfr ?= "2.1.1" -PREFERRED_VERSION_mpfr-native ?= "2.1.1" +PREFERRED_VERSION_mpfr ?= "2.3.0" +PREFERRED_VERSION_mpfr-native ?= "2.3.0" PREFERRED_VERSION_mpg123 ?= "0.66" PREFERRED_VERSION_mpg321 ?= "0.2.10" PREFERRED_VERSION_mplayer-common ?= "0.0.1" @@ -2086,7 +2086,7 @@ PREFERRED_VERSION_xrdb ?= "1.0.4" PREFERRED_VERSION_xscreensaver ?= "4.22" PREFERRED_VERSION_xscrnsaverh ?= "1.0" PREFERRED_VERSION_xserver-common ?= "1.18" -PREFERRED_VERSION_xserver-kdrive ?= "1.4" +PREFERRED_VERSION_xserver-kdrive ?= "1.3.0.0" PREFERRED_VERSION_xserver-kdrive-common ?= "0.1" PREFERRED_VERSION_xserver-nodm-init ?= "1.0" PREFERRED_VERSION_xserver-xorg ?= "1.3.0.0" diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc index 6726710aa9..837aec9f2d 100644 --- a/conf/distro/include/angstrom-eglibc.inc +++ b/conf/distro/include/angstrom-eglibc.inc @@ -5,14 +5,12 @@ PREFERRED_PROVIDER_virtual/libc = "eglibc" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "eglibc-initial" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "eglibc-intermediate" - - +PREFERRED_PROVIDER_virtual/arm${TARGET_VENDOR}-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/armeb${TARGET_VENDOR}-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/arm${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/powerpc${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/mipsel${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/sparc${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc-intermediate" TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 8116bcb307..510a752211 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -35,6 +35,9 @@ require conf/distro/include/angstrom-package-${ANGSTROM_PKG_FORMAT}.inc PREFERRED_PROVIDER_qemu-native = "qemu-native" ENABLE_BINARY_LOCALE_GENERATION ?= "1" +# We only want to build UTF8 locales +LOCALE_UTF8_ONLY = "1" + #qemu doesn't like armv6/eabi/vfp ENABLE_BINARY_LOCALE_GENERATION_mx31ads = "0" ENABLE_BINARY_LOCALE_GENERATION_nokia800 = "0" @@ -185,6 +188,8 @@ FEED_ARCH_lsppchd = "ppc603e" FEED_ARCH_lsppchg = "ppc603e" FEED_ARCH_storcenter = "ppc603e" FEED_ARCH_turbostation = "ppc603e" +FEED_ARCH_mpc8313e-rdb = "ppce300c3" +FEED_ARCH_mpc8323e-rdb = "ppce300c2" #strongarm machines, no EABI @@ -250,10 +255,11 @@ TINDER_REPORT = "1" # seppuku bbclass SEPPUKU_LOGIN = "http://bugs.openembedded.org/query.cgi?" -SEPPUKU_QUERY = "http://bugs.openembedded.org/buglist.cgi?" +SEPPUKU_QUERY = "http://bugs.openembedded.org/buglist.cgi?" SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" -SEPPUKU_ADDCOMMENT = "http://bugs.openembedded.org/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"SEPPUKU_ATTACHMENT = "http://bugs.openembedded.org/attachment.cgi?" -SEPPUKU_AUTOBUILD = "1" +SEPPUKU_ADDCOMMENT = "http://bugs.openembedded.org/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" +SEPPUKU_ATTACHMENT = "http://bugs.openembedded.org/attachment.cgi?" +SEPPUKU_AUTOBUILD = "1" SEPPUKU_PRODUCT = "Openembedded" SEPPUKU_COMPONENT = "build" diff --git a/conf/distro/include/insane-srcrevs.inc b/conf/distro/include/insane-srcrevs.inc index c70e799705..e039a144d3 100644 --- a/conf/distro/include/insane-srcrevs.inc +++ b/conf/distro/include/insane-srcrevs.inc @@ -1,6 +1,7 @@ SRCREV_pn-aircrack-ng ?= "${AUTOREV}" SRCREV_pn-dfu-util ?= "${AUTOREV}" SRCREV_pn-dfu-util-native ?= "${AUTOREV}" +SRCREV_pn-eds-dbus ?= "${AUTOREV}" SRCREV_pn-eglibc ?= "${AUTOREV}" SRCREV_pn-eglibc-initial ?= "${AUTOREV}" SRCREV_pn-eglibc-intermediate ?= "${AUTOREV}" @@ -19,6 +20,7 @@ SRCREV_pn-libmokopanelui2 ?= "${AUTOREV}" SRCREV_pn-libmokoui2 ?= "${AUTOREV}" SRCREV_pn-libowl ?= "${AUTOREV}" SRCREV_pn-libxosd ?= "${AUTOREV}" +SRCREV_pn-linux-openmoko ?= "${AUTOREV}" SRCREV_pn-llvm-gcc4 ?= "${AUTOREV}" SRCREV_pn-llvm-gcc4-cross ?= "${AUTOREV}" SRCREV_pn-maemo-mapper ?= "${AUTOREV}" @@ -60,6 +62,7 @@ SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}" SRCREV_pn-openmoko-session ?= "${AUTOREV}" +SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}" SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}" SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}" SRCREV_pn-openmoko-stylus-demo ?= "${AUTOREV}" diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index aeb0a2afbc..316fc5a4de 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -35,6 +35,7 @@ SRCREV_pn-openmoko-keyboard ?= "${AUTOREV}" SRCREV_pn-openmoko-libs ?= "${AUTOREV}" SRCREV_pn-openmoko-mediaplayer2 ?= "${AUTOREV}" SRCREV_pn-openmoko-messages ?= "${AUTOREV}" +SRCREV_pn-openmoko-messages2 ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-bt ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-clock ?= "${AUTOREV}" @@ -44,6 +45,7 @@ SRCREV_pn-openmoko-panel-gps ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}" +SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}" SRCREV_pn-openmoko-session ?= "${AUTOREV}" SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}" SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}" diff --git a/conf/distro/include/preferred-openmoko-versions.inc b/conf/distro/include/preferred-openmoko-versions.inc deleted file mode 100644 index c002776d70..0000000000 --- a/conf/distro/include/preferred-openmoko-versions.inc +++ /dev/null @@ -1,10 +0,0 @@ -# -# Specify which versions of OpenMoko packages to build -# - -# -# Bootloader and Kernel -# - -SRCREV_pn-linux-openmoko ?= "2937" - diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index e5db7a9ceb..4d9509fc15 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -53,7 +53,7 @@ SRCDATE_gtkhtml2 ?= "20060323" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCDATE = "20070819" +EFL_SRCDATE = "20071206" SRCDATE_edb-native ?= "${EFL_SRCDATE}" SRCDATE_edb ?= "${EFL_SRCDATE}" SRCDATE_eet-native ?= "${EFL_SRCDATE}" @@ -88,6 +88,8 @@ SRCDATE_eflpp ?= "${EFL_SRCDATE}" SRCDATE_python-evas ?= "${EFL_SRCDATE}" SRCDATE_python-ecore ?= "${EFL_SRCDATE}" SRCDATE_python-edje ?= "${EFL_SRCDATE}" +SRCDATE_python-emotion ?= "${EFL_SRCDATE}" +SRCDATE_python-epsilon ?= "${EFL_SRCDATE}" SRCDATE_python-ewl ?= "${EFL_SRCDATE}" SRCDATE_python-etk ?= "${EFL_SRCDATE}" @@ -101,8 +103,11 @@ SRCDATE_exhibit ?= "${EFL_SRCDATE}" SRCDATE_expedite ?= "${EFL_SRCDATE}" SRCDATE_elitaire ?= "${EFL_SRCDATE}" SRCDATE_entice ?= "${EFL_SRCDATE}" +SRCDATE_entrance ?= "${EFL_SRCDATE}" SRCDATE_e-utils ?= "${EFL_SRCDATE}" +SRCDATE_e-wm ?= "${EFL_SRCDATE}" SRCDATE_enna ?= "${EFL_SRCDATE}" +SRCDATE_exquisite ?= "${EFL_SRCDATE}" # Misc packages, sorted by alphabet SRCDATE_avetanabt ?= "20060814" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index e537c66c30..a65f477296 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -9,45 +9,51 @@ SRCREV_pn-aircrack-ng ?= "802" SRCREV_pn-bfin-uclibc ?= "1857" +SRCREV_pn-contact ?= "1410" SRCREV_pn-dbus-c++-native ?= "13131" SRCREV_pn-dbus-c++ ?= "13131" SRCREV_pn-dfu-util ?= "2866" SRCREV_pn-dfu-util-native ?= "2866" -SRCREV_pn-eglibc ?= "3531" -SRCREV_pn-eglibc-initial ?= "3531" -SRCREV_pn-eglibc-intermediate ?= "3531" -SRCREV_pn-ezxd ?= "2070" -SRCREV_pn-elf2flt="1786" +SRCREV_pn-eds-dbus ?= "628" +SRCREV_pn-eglibc ?= "4355" +SRCREV_pn-eglibc-initial ?= "4355" +SRCREV_pn-eglibc-intermediate ?= "4355" +SRCREV_pn-ezxd ?= "2074" +SRCREV_pn-elf2flt ?= "1786" +SRCREV_pn-epiphany ?= "7650" SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "606" SRCREV_pn-gnuradio ?= "6377" SRCREV_pn-gypsy ?= "56" -SRCREV_pn-hildon-1 ?= "14173" +SRCREV_pn-hildon-1 ?= "14429" SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" +SRCREV_pn-libcalenabler2 ?= "1410" SRCREV_pn-libfakekey ?= "1455" -SRCREV_pn-libgsmd ?= "3074" +SRCREV_pn-libgsmd ?= "3519" SRCREV_pn-libgsmd-devel ?= "3293" -SRCREV_pn-libjana ?= "665" -SRCREV_pn-libmokogsmd2 ?= "2950" +SRCREV_pn-libjana ?= "697" +SRCREV_pn-libmokogsmd2 ?= "3378" SRCREV_pn-libmokojournal2 ?= "3217" -SRCREV_pn-libmokopanelui2 ?= "3226" +SRCREV_pn-libmokopanelui2 ?= "3349" SRCREV_pn-libmokoui2 ?= "3229" SRCREV_pn-libowl ?= "277" SRCREV_pn-libxosd ?= "627" -SRCREV_pn-linux-bfin ?= "3745" +SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" +SRCREV_pn-linux-ixp4xx ?= "927" +SRCREV_pn-linux-openmoko ?= "3238" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" -SRCREV_pn-maemo-mapper ?= "108" -SRCREV_pn-matchbox-desktop-2 ?= "1649" +SRCREV_pn-maemo-mapper ?= "118" +SRCREV_pn-matchbox-desktop-2 ?= "1778" SRCREV_pn-matchbox-keyboard ?= "1739" SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739" SRCREV_pn-matchbox-panel-2 ?= "1626" -SRCREV_pn-moko-gtk-engine ?= "3207" +SRCREV_pn-moko-gtk-engine ?= "3405" SRCREV_pn-mpd-alsa ?= "6952" -SRCREV_pn-neod ?= "2956" +SRCREV_pn-neod ?= "3421" SRCREV_pn-oh-puzzles ?= "22" SRCREV_pn-osb-browser ?= "125" SRCREV_pn-osb-jscore ?= "117" @@ -55,66 +61,70 @@ SRCREV_pn-osb-nrcit ?= "125" SRCREV_pn-osb-nrcore ?= "126" SRCREV_pn-openmoko-appearance ?= "3239" SRCREV_pn-openmoko-appmanager ?= "1851" -SRCREV_pn-openmoko-appmanager2 ?= "3299" +SRCREV_pn-openmoko-appmanager2 ?= "3442" SRCREV_pn-openmoko-browser2 ?= "3249" SRCREV_pn-openmoko-calculator ?= "2404" SRCREV_pn-openmoko-calculator2 ?= "3235" SRCREV_pn-openmoko-common ?= "397" -SRCREV_pn-openmoko-common2 ?= "2679" +SRCREV_pn-openmoko-common2 ?= "3259" SRCREV_pn-openmoko-contacts ?= "2298" -SRCREV_pn-openmoko-contacts2 ?= "358" +SRCREV_pn-openmoko-contacts2 ?= "374" SRCREV_pn-openmoko-dates ?= "467" -SRCREV_pn-openmoko-dates2 ?= "658" +SRCREV_pn-openmoko-dates2 ?= "661" SRCREV_pn-openmoko-dialer ?= "2811" -SRCREV_pn-openmoko-dialer2 ?= "3298" +SRCREV_pn-openmoko-dialer2 ?= "3522" SRCREV_pn-openmoko-feedreader2 ?= "3080" SRCREV_pn-openmoko-finger-demo ?= "1671" SRCREV_pn-openmoko-firststart2 ?= "3158" SRCREV_pn-openmoko-footer ?= "2354" SRCREV_pn-openmoko-icon-theme-standard ?= "2232" -SRCREV_pn-openmoko-icon-theme-standard2 ?= "3225" -SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3225" +SRCREV_pn-openmoko-icon-theme-standard2 ?= "3247" +SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3247" SRCREV_pn-openmoko-keyboard ?= "1631" SRCREV_pn-openmoko-libs ?= "2367" -SRCREV_pn-openmoko-mediaplayer2 ?= "3300" +SRCREV_pn-openmoko-mediaplayer2 ?= "3345" SRCREV_pn-openmoko-messages ?= "2276" -SRCREV_pn-openmoko-panel-battery ?= "3272" -SRCREV_pn-openmoko-panel-bt ?= "2896" +SRCREV_pn-openmoko-messages2 ?= "3477" +SRCREV_pn-openmoko-panel-battery ?= "3360" +SRCREV_pn-openmoko-panel-bt ?= "3149" SRCREV_pn-openmoko-panel-clock ?= "2567" SRCREV_pn-openmoko-panel-demo ?= "1622" SRCREV_pn-openmoko-panel-demo-simple ?= "1328" SRCREV_pn-openmoko-panel-gps ?= "2900" -SRCREV_pn-openmoko-panel-gsm ?= "3185" +SRCREV_pn-openmoko-panel-gsm ?= "3256" SRCREV_pn-openmoko-panel-mainmenu ?= "2567" -SRCREV_pn-openmoko-panel-usb ?= "2893" +SRCREV_pn-openmoko-panel-usb ?= "3360" SRCREV_pn-openmoko-session ?= "152" +SRCREV_pn-openmoko-sample2 ?= "3537" SRCREV_pn-openmoko-simplemediaplayer ?= "1688" SRCREV_pn-openmoko-sound-theme-standard2 ?= "3192" SRCREV_pn-openmoko-stylus-demo ?= "2324" SRCREV_pn-openmoko-stylus-demo-simple ?= "1818" SRCREV_pn-openmoko-taskmanager ?= "1663" SRCREV_pn-openmoko-tasks ?= "320" -SRCREV_pn-openmoko-tasks2 ?= "346" -SRCREV_pn-openmoko-terminal2 ?= "2972" +SRCREV_pn-openmoko-tasks2 ?= "348" +SRCREV_pn-openmoko-terminal2 ?= "3435" SRCREV_pn-openmoko-theme-standard ?= "2370" SRCREV_pn-openmoko-theme-standard-qvga ?= "2370" -SRCREV_pn-openmoko-theme-standard2 ?= "3210" -SRCREV_pn-openmoko-theme-standard2-qvga ?= "3210" +SRCREV_pn-openmoko-theme-standard2 ?= "3425" +SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425" SRCREV_pn-openmoko-today ?= "3056" -SRCREV_pn-openmoko-today2 ?= "3287" -SRCREV_pn-openmoko-today2-folders ?= "2680" -SRCREV_pn-openmoko-worldclock2 ?= "3301" +SRCREV_pn-openmoko-today2 ?= "3478" +SRCREV_pn-openmoko-today2-folders ?= "3414" +SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openocd ?= "206" SRCREV_pn-openocd-native ?= "206" SRCREV_pn-oprofileui ?= "160" SRCREV_pn-psplash ?= "249" +SRCREV_pn-python-formencode = "3148" SRCREV_pn-settings-daemon ?= "1755" SRCREV_pn-sjf2410-linux-native ?= "933" SRCREV_pn-sphyrna ?= "45" -SRCREV_pn-tmut ?= "15" +SRCREV_pn-tmut ?= "60" SRCREV_pn-webkit-gtk ?= "27222" SRCREV_pn-webkit-qt ?= "27222" SRCREV_pn-webkit-qtopia ?= "27222" +SRCREV_pn-wesnoth ?= "22021" SRCREV_pn-xoo ?= "1623" SRCREV_pn-mplayer ?= "24587" SRCREV_pn-networkmanager ?= "2887" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 652373a3eb..ab80719646 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -16,7 +16,7 @@ #TARGET_OS "linux" or "linux-uclibc" # The following may be overridden to make sub-versions -SLUGOS_VERSION = "4.6" +SLUGOS_VERSION = "4.7" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): @@ -64,6 +64,7 @@ FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME} # to enable/disable debugging in the distro. Here noirqdebug is used to # remove the messages about unhandled interrupts - people debugging interrupt # issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf) +CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc" CMDLINE_DEBUG = "noirqdebug" # EXTRA PACKAGES @@ -89,28 +90,38 @@ DISTRO_EXTRA_RRECOMMENDS ?= "" # necessary to define which gets generated first, glibc or the kernel, and # this is done by selecting the provider of libc (in this case it needs the # kernel, so there has to be a non-libc gcc to build the kernel!) -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" -# Select 2.6 versions of the depmod support -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" + +# Virtuals: +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" + +#Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo) +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate" + +# Set the preferred provider for a few toolchain-related items, otherwise +# these may be selected from the external-toolchain instead. +PREFERRED_PROVIDER_virtual/arm-linux-binutils = "binutils-cross" +PREFERRED_PROVIDER_virtual/armeb-linux-binutils = "binutils-cross" +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" # compiler/binary/library versions -PREFERRED_VERSION_binutils ?= "2.16" -PREFERRED_VERSION_binutils-cross ?= "2.16" -PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" -PREFERRED_VERSION_gcc-cross ?= "4.1.1" -PREFERRED_VERSION_gcc ?= "4.1.1" -PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" -#For SVN uclibc: -#SRCDATE_uclibc ?= "20060120" -#PREFERRED_VERSION_uclibc ?= "0.9.28+svn${SRCDATE_uclibc}" +PREFERRED_VERSION_binutils ?= "2.18" +PREFERRED_VERSION_binutils-cross ?= "2.18" +PREFERRED_VERSION_binutils-cross-sdk ?= "2.18" +PREFERRED_VERSION_gcc ?= "4.1.2" +PREFERRED_VERSION_gcc-cross ?= "4.1.2" +PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2" +PREFERRED_VERSION_gcc-cross-initial ?= "4.1.2" +PREFERRED_VERSION_glibc ?= "2.5" +PREFERRED_VERSION_glibc-intermediate ?= "2.5" +PREFERRED_VERSION_glibc-initial ?= "2.5" # Select the correct versions of the kernel and modules (these are the # defaults, override in the conf/distro top-level distro file). -PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx" PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.6" # Select the smallest provider of x11 libraries @@ -139,12 +150,7 @@ PREFERRED_VERSION_ipkg-native ?= "0.99.163" #FIXME: HACK: REMOVE THIS IGNORE_STRIP_ERRORS = "" -# Due to upstream instability, and another OE project with conflicting -# needs, nail down a specific, known-working version of madwifi-ng. -# Remove this once the madwifi-ng stuff seems to stabilize once again. -#PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225" - -PREFERRED_VERSION_linux-libc-headers = "2.6.18" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.20" # we don't ship gtk-directfb by default PREFERRED_PROVIDER_gtk+ ?= "gtk+" diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 0f2716b0db..f2007c231f 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -24,10 +24,12 @@ PREMIRRORS = "(ftp|https?)$://.*/.*/ http://downloads.openmoko.org/sources/" FEED_URIS = "\ snapshot-all##http://buildhost.openmoko.org/snapshots/2007.08/ipk/all \ snapshot-armv4t##http://buildhost.openmoko.org/snapshots/2007.08/ipk/armv4t \ + snapshot-neo1973##http://buildhost.openmoko.org/snapshots/2007.08/ipk/neo1973 \ snapshot-fic-gta01##http://buildhost.openmoko.org/snapshots/2007.08/ipk/fic-gta01 \ \ updates-all##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/all \ updates-armv4t##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/armv4t \ + updates-neo1973##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/neo1973 \ updates-fic-gta01##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/fic-gta01 " # 2.18 seems to break badly on 64-bit systems @@ -37,8 +39,6 @@ PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12" # we want the openmoko svn version of gsmd PREFERRED_PROVIDER_libgsmd = "libgsmd" -require conf/distro/include/preferred-openmoko-versions.inc - # Bleeding-edge developers should add the following line to their local.conf: # require conf/distro/include/moko-autorev.inc @@ -62,7 +62,7 @@ PACKAGE_ARCH_pn-keymaps_fic-gta02 = "${MACHINE_CLASS}" PACKAGE_ARCH_pn-neod_fic-gta01 = "${MACHINE_CLASS}" PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACHINE_CLASS}" -# Select packge versions we wash to use. +# Select package versions we want to use. PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling" PREFERRED_VERSION_gtk+-fastscaling = "2.10.14" diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index 564a2d0cfb..29c96ce384 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -19,3 +19,4 @@ require conf/distro/include/slugos.inc PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" PREFERRED_PROVIDER_virtual/libintl ?= "glibc" PREFERRED_PROVIDER_virtual/libc ?= "glibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial" diff --git a/conf/local.conf.sample b/conf/local.conf.sample index cf3c793c68..0fa2b7d122 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -77,7 +77,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # openzaurus-unstable is a so called "versioned" distro, i.e. they # explicitely select specific versions of various packages. # Stay away from unversioned distros unless you really know what you are doing -# DISTRO = "generic" +# DISTRO = "angstrom-2007.1" # So far, angstrom.conf sets ENABLE_BINARY_LOCALE_GENERATION # to generate binary locale packages at build time using qemu-native and diff --git a/conf/machine/alix.conf b/conf/machine/alix.conf index 3c50ef561b..f4423946bd 100644 --- a/conf/machine/alix.conf +++ b/conf/machine/alix.conf @@ -17,7 +17,7 @@ GLIBC_EXTRA_OECONF = "--with-tls" MACHINE_FEATURES = "kernel26 usbhost ext2 pci screen alsa acpi x86" -require.inc/machine/include/tune-geodelx.inc +require conf/machine/include/tune-geodelx.inc IMAGE_FSTYPES += "tar.gz" diff --git a/conf/machine/aximx50.conf b/conf/machine/aximx50.conf index 0dda9492e9..b119a24359 100644 --- a/conf/machine/aximx50.conf +++ b/conf/machine/aximx50.conf @@ -32,10 +32,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_VERSION_orinoco-modules = "0.15rc1" MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" -MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \ - kernel-module-nls-iso8859-1 \ - kernel-module-nls-utf8 \ - kernel-module-af-key \ +MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-i2c-pxa" # diff --git a/conf/machine/davinci-sffsdr.conf b/conf/machine/davinci-sffsdr.conf new file mode 100644 index 0000000000..ecff6fae13 --- /dev/null +++ b/conf/machine/davinci-sffsdr.conf @@ -0,0 +1,25 @@ +#@TYPE: Machine +#@NAME: DM6446 cpu on a Lyrtech Small Form Factor SDR board +#@DESCRIPTION: Machine configuration for the Lyrtech Small Form Factor SDR board + +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4t armv5te" + +HOTPLUG = "udev" + +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +PREFERRED_PROVIDER_virtual/kernel = "linux-davinci" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" + +PREFERRED_VERSION_u-boot = "git" +UBOOT_MACHINE = "davinci_sffsdr_config" + +SERIAL_CONSOLE ?= "115200 ttyS0" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" + +#ROOT_FLASH_SIZE = "29" + +MACHINE_FEATURES = "kernel26 pcmcia usbhost alsa" + +require conf/machine/include/tune-arm926ejs.inc + diff --git a/conf/machine/em-x270.conf b/conf/machine/em-x270.conf index 95ba519d3b..3cf0a7fab2 100644 --- a/conf/machine/em-x270.conf +++ b/conf/machine/em-x270.conf @@ -21,10 +21,10 @@ require conf/machine/include/tune-xscale.inc ROOT_FLASH_SIZE = "128" IMAGE_CMD_jffs2 = " \ -/usr/sbin/mkfs.jffs2 --root=${IMAGE_ROOTFS} \ - --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ - --eraseblock=0x20000 --pad --faketime -n; \ -/usr/sbin/sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + mkfs.jffs2 --root=${IMAGE_ROOTFS} \ + --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + --eraseblock=0x20000 --pad --faketime -n; \ + sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ -e 0x20000 -p; \ cd ${DEPLOY_DIR_IMAGE}; \ diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index bd14df5814..09517fd11d 100644 --- a/conf/machine/fic-gta01.conf +++ b/conf/machine/fic-gta01.conf @@ -16,6 +16,7 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" MACHINE_DISPLAY_PPI = "285" +XSERVER = "xserver-kdrive-fbdev" # package machine specific modules MACHINE_EXTRA_RRECOMMENDS = "\ diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf index 1760424fc8..4cad7924f1 100644 --- a/conf/machine/fic-gta02.conf +++ b/conf/machine/fic-gta02.conf @@ -16,6 +16,7 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" MACHINE_DISPLAY_PPI = "285" +XSERVER = "xserver-kdrive-glamo xserver-kdrive-fbdev" # package machine specific modules MACHINE_EXTRA_RRECOMMENDS = "\ @@ -26,7 +27,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-s3cmci \ kernel-module-ext2 \ kernel-module-vfat \ - kernel-module-snd-soc-neo1973-wm8753 \ + kernel-module-snd-soc-neo1973-gta02-wm8753 \ kernel-module-snd-soc-smdk2440 \ kernel-module-nls-iso8859-1 \ kernel-module-nls-cp437 \ diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 60a732ffa6..c149da18fa 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -27,12 +27,19 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" MACHINE_EXTRA_RDEPENDS = "h2200-bootloader udev-hostap-cs-vcc-workaround" +MACHINE_EXTRA_RRECOMMENDS = "\ + kernel-module-snd-h2200-audio \ + kernel-module-i2c-pxa \ + " + EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000" # # Modules autoload and other boot properties # module_autoload_snd-pcm-oss = "snd-pcm-oss" +module_autoload_snd-mixer-oss = "snd-mixer-oss" +module_autoload_snd-h2000-audio = "snd-h2000-audio" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index 9cf8272b51..1fcaf664d4 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -27,32 +27,11 @@ PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" MACHINE_EXTRA_RDEPENDS = "ipaq-boot-params" -MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \ +MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-micro" EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl" - - -# TODO: see if any of these modules have 2.6 counterparts -# and need to be RRECOMMENDED -# -#H3600_MODULES = "\ -#h3600-asic \ -#hwtimer \ -#nvrd \ -#sa1100-cs \ -#sa1100-ir \ -#sa1100-wdt \ -#sa1100-audio \ -#sa1100-rtc \ -#sa1100usb-core \ -#sd-mod \ -#serial-h3800 \ -#" - - - # # Modules autoload and other boot properties # diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index f56bee00e8..0683498c5f 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -26,8 +26,9 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware ${PCMCIA_MANAGER}" MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \ - kernel-module-h4000-pcmcia \ kernel-module-i2c-pxa \ + kernel-module-h4000-bt \ + kernel-module-h4000-pcmcia \ kernel-module-acx \ " @@ -36,7 +37,7 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \ # module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-mixer-oss = "snd-mixer-oss" -module_autoload_snd-h4000_audio = "snd-h4000_audio" +module_autoload_snd-h4000-audio = "snd-h4000-audio" module_autoload_g_ether = "g_ether" module_conf_acx = "blacklist acx" diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index c3e7cf710e..b7b9b5cdc0 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -28,11 +28,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" XSERVER = "xserver-kdrive-fbdev" MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" -MACHINE_EXTRA_RRECOMMENDS = " kernel-module-nls-cp437 \ - kernel-module-nls-iso8859-1 \ - kernel-module-nls-utf8 \ - kernel-module-af-key \ - kernel-module-bsd-comp \ +MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-i2c-pxa \ kernel-module-snd-htcuniversal-audio \ kernel-module-htcuniversal-acx \ diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index 87e03a7bdd..daa74866b2 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -34,10 +34,7 @@ XSERVER = "xserver-kdrive-w100" PREFERRED_VERSION_orinoco-modules = "0.15rc1" MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" -MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \ - kernel-module-nls-iso8859-1 \ - kernel-module-nls-utf8 \ - kernel-module-af-key \ +MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-i2c-pxa \ kernel-module-pxa27x-voltage \ kernel-module-pxa27x-voltage-max158xx \ diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc index 175ec80e6a..6e7d303586 100644 --- a/conf/machine/include/ixp4xx.inc +++ b/conf/machine/include/ixp4xx.inc @@ -2,13 +2,24 @@ #@NAME: ixp4xx #@DESCRIPTION: genric machine configuration for ixp4xx platforms -MACHINE_FEATURES = "kernel26 usbhost ext2" +# Set default for common ixp4xx-based machines +MACHINE_FEATURES ?= "kernel26 usbhost ext2 redboot apex" +# Select an appropriate default kernel +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx" +PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}" + +# Add packages required for basic networking support +MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe" + +# Set default for 16MB machines - can be overridden for more or less flash. ROOT_FLASH_SIZE ?= "12" -EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n" +# Allow for rootfs loaded direct from internal hard disk +IMAGE_FSTYPES ?= "jffs2 tar.gz" -PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" +# Set default for common ixp4xx-based machines +EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n" require conf/machine/include/tune-xscale.inc require conf/machine/include/tune-thumb.inc diff --git a/conf/machine/include/tune-geodelx.conf b/conf/machine/include/tune-geodelx.inc index 335fadec6e..335fadec6e 100644 --- a/conf/machine/include/tune-geodelx.conf +++ b/conf/machine/include/tune-geodelx.inc diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 8f48c614d1..7e41da0783 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -55,7 +55,7 @@ zaurus_make_installkit () { cp gnu-tar ${IMAGE_NAME}-installkit/ cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz else - cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin + [ -f ${IMAGE_NAME}.rootfs.jffs2 ] && cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin fi # All zaurus machines except collie need updater.sh diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index 900b24b751..e099825a40 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -41,7 +41,6 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_VERSION_orinoco-modules = "0.15rc1" MACHINE_EXTRA_RRECOMMENDS = " \ - kernel-module-af-key \ kernel-module-i2c-pxa \ kernel-module-pxa27x-voltage \ kernel-module-pxa27x-voltage-max158xx \ diff --git a/conf/machine/mpc8313e-rdb.conf b/conf/machine/mpc8313e-rdb.conf index f32f78ee8a..81c3e29e91 100644 --- a/conf/machine/mpc8313e-rdb.conf +++ b/conf/machine/mpc8313e-rdb.conf @@ -10,8 +10,12 @@ PREFERRED_VERSION_u-boot = "git" MACHINE_FEATURES = "kernel26 usbhost ext2" +PREFERRED_VERSION_u-boot = "1.3.0" UBOOT_MACHINE = "MPC8313ERDB_33_config" +#rootfs on NAND flash +EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x4000 --no-cleanmarkers" + #don't try to access tty1 USE_VT = "0" diff --git a/conf/machine/mpc8323e-rdb.conf b/conf/machine/mpc8323e-rdb.conf index a6b29552c5..ee2c6144a9 100644 --- a/conf/machine/mpc8323e-rdb.conf +++ b/conf/machine/mpc8323e-rdb.conf @@ -3,14 +3,14 @@ #@DESCRIPTION: Machine configuration for the Freescale MPC8323E-RDB TARGET_ARCH = "powerpc" -TARGET_FPU = "soft" +TARGET_FPU ?= "soft" PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppce300c2" PREFERRED_PROVIDER_virtual/kernel = "linux" -MACHINE_FEATURES = "kernel26 usbhost ext2" +MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot" -PREFERRED_VERSION_u-boot = "git" +PREFERRED_VERSION_u-boot = "1.1.6" UBOOT_MACHINE = "MPC8323ERDB_config" EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000" diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index 3b527293df..ab3da912ba 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -2,7 +2,7 @@ #@NAME: SIEMENS SIMpad SL4, SIEMENS SIMpad CL4, SIEMENS SIMpad SLC, Telekom T-Sinus PAD #@DESCRIPTION: Machine configuration for the SA1100 based SIEMENS SIMpad and Telekom T-Sinus PAD devices -MACHINE_KERNEL_VERSION ?= "2.4" +MACHINE_KERNEL_VERSION ?= "2.6" TARGET_ARCH = "arm" diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index d70db72f38..d8ea4b8890 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -6,9 +6,6 @@ require conf/machine/include/zaurus-2.6.inc IMAGE_FSTYPES ?= "jffs2" -# newer kernels does not build -PREFERRED_VERSION_linux-rp = "2.6.17" - # wlan-ng Modules MACHINE_EXTRA_RRECOMMENDS += "wlan-ng-modules-usb" diff --git a/conf/machine/vmware.conf b/conf/machine/vmware.conf new file mode 100644 index 0000000000..4822c389a1 --- /dev/null +++ b/conf/machine/vmware.conf @@ -0,0 +1,25 @@ +# Copyright (C) 2007, Florian Boor - based on x86.conf: +# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved +# Released under the MIT license (see packages/COPYING) +#@TYPE: Machine +#@NAME: VMWare +#@DESCRIPTION: Machine configuration for a VMWare virtual PC + +TARGET_ARCH = "i686" +PACKAGE_EXTRA_ARCHS = "vmware" + +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" +XSERVER="xserver-kdrive-vesa" + +KERNEL_IMAGETYPE = "bzImage" + +MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" +MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen x86" + +udevdir = "/dev" +OLDEST_KERNEL = "2.6.17" +GLIBC_ADDONS = "nptl" +GLIBC_EXTRA_OECONF = "--with-tls" + +require conf/machine/include/pentiumpro.inc |