diff options
92 files changed, 2454 insertions, 484 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 8ff2346a34..b50bc8667c 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -773,7 +773,7 @@ def base_detect_branch(d): for scm in scms: rev = scm(d) if rev <> "<unknown>": - return rev + return rev.strip() return "<unknown>" diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index 889ace2e99..d69be35b40 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -10,9 +10,19 @@ do_rootfs[recrdeptask] += "do_package_write_ipk" IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS} ${@base_conditional("PACKAGE_INSTALL_NO_DEPS", "1", "-nodeps", "", d)}" -DISTRO_EXTRA_RDEPENDS += " opkg opkg-collateral " PACKAGE_INSTALL_NO_DEPS ?= "0" +# What support to provide for online management of packages at run time? +# full -> traditional system, opkg is installed with all metadata +# add -> opkg is installed with basic conf files but no status database; can add new packages at runtime but not modify existing ones +# none -> opkg not installed at all, no metadata or config files provided +ONLINE_PACKAGE_MANAGEMENT ?= "full" + +# Which packages to not install on the basis of a recommendation +BAD_RECOMMENDATIONS ?= "" + +DISTRO_EXTRA_RDEPENDS += "${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "opkg opkg-collateral", d)}" + fakeroot rootfs_ipk_do_rootfs () { set -x @@ -21,6 +31,16 @@ fakeroot rootfs_ipk_do_rootfs () { mkdir -p ${T} mkdir -p ${IMAGE_ROOTFS}${libdir}/opkg/ + + STATUS=${IMAGE_ROOTFS}${libdir}/opkg/status + # prime the status file with bits that we don't want + for i in ${BAD_RECOMMENDATIONS}; do + echo "Package: $i" >> $STATUS + echo "Architecture: ${TARGET_ARCH}" >> $STATUS + echo "Status: deinstall ok not-installed" >> $STATUS + echo >> $STATUS + done + opkg-cl ${IPKG_ARGS} update # Uclibc builds don't provide this stuff... @@ -42,7 +62,10 @@ fakeroot rootfs_ipk_do_rootfs () { export OPKG_OFFLINE_ROOT=${IPKG_OFFLINE_ROOT} mkdir -p ${IMAGE_ROOTFS}${sysconfdir}/opkg/ - grep "^arch" ${IPKGCONF_TARGET} >${IMAGE_ROOTFS}${sysconfdir}/opkg/arch.conf + + if [ "${ONLINE_PACKAGE_MANAGEMENT}" != "none" ]; then + grep "^arch" ${IPKGCONF_TARGET} >${IMAGE_ROOTFS}${sysconfdir}/opkg/arch.conf + fi for i in ${IMAGE_ROOTFS}${libdir}/opkg/info/*.preinst; do if [ -f $i ] && ! sh $i; then @@ -58,11 +81,20 @@ fakeroot rootfs_ipk_do_rootfs () { install -d ${IMAGE_ROOTFS}/${sysconfdir} echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version - rm -f ${IMAGE_ROOTFS}${libdir}/opkg/lists/* + if [ "${ONLINE_PACKAGE_MANAGEMENT}" != "none" ]; then + if [ "${ONLINE_PACKAGE_MANAGEMENT}" == "add" ]; then + rm -f ${IMAGE_ROOTFS}${libdir}/opkg/status + rm -f ${IMAGE_ROOTFS}${libdir}/opkg/*/* + else + rm -f ${IMAGE_ROOTFS}${libdir}/opkg/lists/* + fi - # Keep these lines until package manager selection is implemented - ln -s opkg ${IMAGE_ROOTFS}${sysconfdir}/ipkg - ln -s opkg ${IMAGE_ROOTFS}${libdir}/ipkg + # Keep these lines until package manager selection is implemented + ln -s opkg ${IMAGE_ROOTFS}${sysconfdir}/ipkg + ln -s opkg ${IMAGE_ROOTFS}${libdir}/ipkg + else + rm -rf ${IMAGE_ROOTFS}${libdir}/opkg + fi ${ROOTFS_POSTPROCESS_COMMAND} diff --git a/classes/xfce.bbclass b/classes/xfce.bbclass index c6ccc5fd2c..48e012e67e 100644 --- a/classes/xfce.bbclass +++ b/classes/xfce.bbclass @@ -8,7 +8,8 @@ HOMEPAGE = "http://www.xfce.org" LICENSE = "LGPL-2" DEPENDS += "startup-notification" -SRC_URI = "http://www.us.xfce.org/archive/xfce-${PV}/src/${PN}-${PV}.tar.bz2" +XFCE_VERSION = ${PV} +SRC_URI = "http://www.us.xfce.org/archive/xfce-${XFCE_VERSION}/src/${PN}-${PV}.tar.bz2" inherit autotools diff --git a/conf/checksums.ini b/conf/checksums.ini index 72fe934b7e..2e56e1cf4b 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -234,6 +234,10 @@ sha256=f199f7558e6a071ae1ead06b9207c0819281b6b2094dcef6fc4201a4bdf8854d md5=0b89b73970c7d490ad9a13718b74d27b sha256=5ed480cb76c91c2739ddba87f15437510e58c60dfdd7ead6f469149b2da94bb7 +[http://kernel.org/pub/linux/libs/pam/library/Linux-PAM-1.0.2.tar.bz2] +md5=fc5e35645b75befae28c88b711b28ffb +sha256=42d06febf4717dd43eb557027d1b00a484c22589793438778ed69449a073a3b8 + [http://ltt.polymtl.ca/packages/LinuxTraceToolkitViewer-0.8.41-12052006.tar.gz] md5=de139052f234cf54d714c960524bd5ef sha256=a21431358d7f2a5deb76b1a95ee80dc870b0dc2426d4860c61144343d48eff3e @@ -542,6 +546,10 @@ sha256=6fd69febfd804437a9d5b610502c6d3c2caabef7a4832a3bcac2357515adaa71 md5=8741490a25b98230973446400971bba9 sha256=c1f29cfd31c335a409bdc530c2e68661d20a1e3c2e5d64454470b6700a40681e +[http://www.us.xfce.org/archive/xfce-4.4.2/src/Terminal-0.2.8.tar.bz2] +md5=cfe660ecf50e9d3b073576bbc4af6ab2 +sha256=20a58b96915f67c5b4f49fb1428e1876195f1f9fd7d37e0081352cadc13463e7 + [http://search.cpan.org/CPAN/authors/id/M/MA/MARKF/Test-Builder-Tester-1.01.tar.gz] md5=4751252f1e33af4f582c8af4c7b7666f sha256=62bc416ccb3f01c3911d9744d6c865d9fa4d008bd47dbecc2adde5c3892ce868 @@ -566,6 +574,10 @@ sha256=b72813be2639d49dda2a3f87928b7ce185633f3afaa25300afbfb844b12deea4 md5=4931662ea353384dec2a54a71b26ee8c sha256=0b654cd39126333a0dab7fdd2fd0c5023f6eb45e72d1d8bf9fb3cab175002bc7 +[http://www.us.xfce.org/archive/xfce-4.4.2/src/Thunar-0.9.0.tar.bz2] +md5=0fc5008858661c0abd0399acbe30ef28 +sha256=26c833b0bdf3281c61e03f1fb985feced88cf4a5cebce7bd055f05e025460037 + [http://tmrc.mit.edu/mirror/twisted/old/Twisted-1.2.0.tar.bz2] md5=d5150e8de83a9d5134d175d068482ab7 sha256=9e488e3ee3fc0f56d8f8898f4729819512dd43afff0fba4e32390d1af4bd53d5 @@ -862,6 +874,10 @@ sha256=bce6638d95fa8d32b109176a7cef6aa71e40c130068fac71b0df369d1a36c82c md5=ed2183311aacf5714afbd825f3671417 sha256=a319f936af9df20cd173d2e4c486cb6f1a011287ebcbd429a7f38c3214f555f3 +[ftp://ftp.buici.com/pub/apex/apex-1.5.14.tar.gz] +md5=22fb46e76c8221c7bcc9734602367460 +sha256=472e12897931d9e5dcf2d1e3332acfc467aafd0f62e612896a9c71dd0d16d950 + [ftp://ftp.buici.com/pub/apex/apex-1.5.8.tar.gz] md5=bb96cc8d50b4f00ee653f0800643ea8a sha256=4ad287720b87213154fa272afee5f442b0d8d61c1f56e43d0d056ae25849a926 @@ -906,6 +922,10 @@ sha256=9ec43259123b89980ad0b5a36b8d582cf877d918019f993f629a9fa5327a5c58 md5=63fef787c263bd8025c6ab6a6cecdd01 sha256=cd1da2119dd812127ab6e6e8cbb954d9b74fe01ec744364ba79c9845865ffdaa +[http://www.apache.org/dist/apr/apr-1.2.12.tar.bz2] +md5=c5da94517e3918f0f2b2e0a05f56aa21 +sha256=db22b34c0bfcab8546632475c6de2c63990214fb8ae5e2ada565410a85e22134 + [http://www.apache.org/dist/apr/apr-1.2.7.tar.bz2] md5=e77887dbafc515c63feac84686bcb3bc sha256=384437f3c4eb7d53ad27fdadce6cbc295ef16653b7f7739a480d91c784082ec9 @@ -1022,6 +1042,54 @@ sha256=85331e63c90370c305121f134358e76cbb06846a12c04a7825d5869f331ee00d md5=3b416557d2c395a36b97a819812e99b0 sha256=2bcc5d5620f8533eb4300ba1b48c9d2a00092ce04588e32f7074cf2aadc34259 +[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.4.8.tar.gz] +md5=e708a5510a61217725b6ad663287dfa0 +sha256=5d5c305079eb9918d271fad28ac73248a7d2962347dbd80d16aac66fe35e2729 + +[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-1.4.8.tar.gz] +md5=febffdf865db7a773ce687b295cb19e9 +sha256=6829f56eaf0221125e83f5547c773895d00ddc725a0b3a7015d22bbcaf6675ed + +[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.4.8.tar.gz] +md5=384e92a24153cf713af2dd7484b5fef3 +sha256=64efa42d1bc77e78c898c2461f45f51fa2b0679e75d36e180bc3969eb0cffd07 + +[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-1.4.8.tar.gz] +md5=05c620267e4653d48815b77d58e93247 +sha256=a48faee879bce9ec753b796b9449db0f2eba47f46845f5497ad6a4e3bae666ee + +[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-1.4.7.tar.gz] +md5=ecc50bd2b9b29d8237911272248c5d35 +sha256=61ff59c7d1a180fbcbec2cf14965ad405fb10d90fc26310848a580bd99a1cf18 + +[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g729-1.4.7.tar.gz] +md5=0de5e5f75197b4e128815867443de775 +sha256=c2e17052da282533cc10a38fcd6c4d3e5b2de43d7909f7391f9fcf34c335c921 + +[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-gsm-1.4.7.tar.gz] +md5=c5ac7e08d98762d5cbb59b0838370fc9 +sha256=de15f3dbf5e1688ebb853e84439d2ef48fd7eab66b1e19469485ed6e47e66161 + +[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-ulaw-1.4.7.tar.gz] +md5=b8063676b102076321b6d4640b4e6126 +sha256=94c2ba9290283851ddfba9e7b29c797412538d7a2002599508ce4122ad74c767 + +[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-alaw.tar.gz] +md5=ef6dca03deeaf1cfd2c97feb5af21538 +sha256=6dec5684b48cb375c226ed94aeee77e35b9db6c7e85abeb9bf5260e8df43cd9c + +[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-g729.tar.gz] +md5=381497d57c39d786cc79200576c5b2cc +sha256=fdb7b483b55457b488fcb788f0254c26ca87cab49dcfb8391d347454fb3a8b7f + +[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-gsm.tar.gz] +md5=da0cbefb40b5670648e1d2cc0010ec9f +sha256=e52b849febb308a6c6b6f4b6445d334e57178373ccf94b8660776c1a8fa45ad1 + +[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-ulaw.tar.gz] +md5=b1115a8c4daa2957a1da98b5eae37104 +sha256=b040f30b07c3277e3c5ef76699761dff2a88f5cfe979de7b46a6ce7676b534e9 + [http://ftp.digium.com/pub/asterisk/releases/asterisk-sounds-1.2.1.tar.gz] md5=bed4259905a7d7bc070c6319142b2075 sha256=bfa7def7d0f1190a111bde232920d2b3481d3932e2d1056573b3a9c4801c602a @@ -1038,6 +1106,10 @@ sha256=0d77c73a3c151a7da647dd924f32151e5ee4574530568fd65067882f79cd5a44 md5=03ccc8d178ee956feb46ab970e982e94 sha256=71e8890e709ee77756368b8508f65c6c9bf8c6ed5e1501726ef30e1dc105d4f5 +[ftp://ftp.debian.org/debian/pool/main/a/atftp/atftp_0.7.dfsg-3.diff.gz] +md5=fa5ea0d162c41c197af48d717df1389f +sha256=2bbf2b8fdf6e12dabb0cc751a973d9040f7ed9123cf87a7f794044f3429b0de0 + [ftp://ftp.debian.org/debian/pool/main/a/atftp/atftp_0.7.orig.tar.gz] md5=3b27365772d918050b2251d98a9c7c82 sha256=9c548c44d3cfdf259118d9fd4e468e1fe4567456dbff8ff59838c5f70ef62ea3 @@ -1442,6 +1514,10 @@ sha256=69d82eff84b1cef08a30e3a79de26df0bce7f531a86d2144ee0d5e43fc21ce86 md5=9ff3204eea27184ea0722f37e43fc95d sha256=9a9411115338d2554f2e99bc676c2e9a381a8d649bf9bd9c0b2ffa2cf74b563c +[ftp://ftp.isc.org/isc/bind9/9.3.5-P1/bind-9.3.5-P1.tar.gz] +md5=1446984f552b18a0ff7db63971a0cb5a +sha256=8bd6b53f5a2c5f0332aaba9a51ef3d7fc55c60f906f0c506e11b6600ed82a90b + [http://fgouget.free.fr/bing/bing_src-1.1.3.tar.gz] md5=0ccd96cc01351c0562f1e4b94aaa2790 sha256=3151893aa5597491b7cb7083b4e786017b522cac55dffacbe475c9abdd7fe61a @@ -2362,6 +2438,10 @@ sha256=99602e966e12347f2728b2153537a14195b06fe130d047e8d91b4f72b24866a0 md5=659d5c53cbace53f44fe7acb666bfe33 sha256=8b718c344cf19417447cbc16867d2e04434654c13b330598b96720ead146b961 +[http://luks.endorphin.org/source/cryptsetup-1.0.5.tar.bz2] +md5=0aa2f94c39123f1a0352983e5366179c +sha256=4bab529afa00cafde3bc5df2769578c88438f80c5152d4257cd0e86986f95bc4 + [http://downloads.sourceforge.net/cscope/cscope-15.5.tar.gz] md5=beb6032a301bb11524aec74bfb5e4840 sha256=be49cda0a9d33add89cabe0dfcef436a2863a7b0b833767875e0b7a6e8b4c4d1 @@ -3302,6 +3382,10 @@ sha256=b72d82e9117308063471993f3832e58064c0599dec3df2bf2a7ce54450984a3e md5=eb8b6d834d2224e17561593dc4158e4d sha256=418c3b9e099b96f7b8e1456c34b585b2f4bd10af88fb976116a154e4cb54fa9b +[http://www.us.xfce.org/archive/xfce-4.4.2/src/exo-0.3.4.tar.bz2] +md5=7a1af943b1df32b6f89ae91823118a22 +sha256=a5373e9bd6055caa7cd5d06128f6236cfd2f4f6657ea4a85d7bd9eafe5bf0538 + [http://downloads.sourceforge.net/expat/expat-1.95.6.tar.gz] md5=ca78d94e83e9f077b5da2bfe28ba986a sha256=b48761f9b67715bb1f85371d0059d744a60ed71e72065da7d5326bbb04e26a92 @@ -3486,6 +3570,10 @@ sha256=d0867cf1dbc58031a6b65375cf899f565569a818400f762dcee3b50de9da9f56 md5=9956b30139edaa4f5f77c4d0dbd80225 sha256=c18e6f23315e0a3526229bd0ba5cf8ce0d747cb5e5ba7cb952ad08c85a1cafac +[ftp://ftp.debian.org/debian/pool/main/f/fetchmail/fetchmail_6.3.8.orig.tar.gz] +md5=1b84621072b4f906b5686a4fbae0b1d7 +sha256=d06e7244dcd2b462c0e7bea0d01edadb54905f4533afc45f971ab9f6ee46497c + [http://downloads.sourceforge.net/ffmpeg/ffmpeg-0.4.9-pre1.tar.gz] md5=ea5587e3c66d50b1503b82ac4179c303 sha256=0e9e771114a75c461e813538f129eb05a251b8fc6591a5563420700b8e312da0 @@ -3990,6 +4078,10 @@ sha256=ab91922367ca4 |