diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-10-22 17:57:15 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-10-22 17:57:15 +0200 |
| commit | 6fe9490eac7366d9da691d4129b8d2d23f19a139 (patch) | |
| tree | 46a8cdc9a72a8c414a7824225bd76ec8c241fbdb /conf | |
| parent | 3836ac00385216dd47d89ec3cebc12e5446feef9 (diff) | |
| parent | ca7e39e27802da8aecf68d74166ec0d2117c8c70 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 13 | ||||
| -rw-r--r-- | conf/checksums.ini | 16 |
2 files changed, 23 insertions, 6 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 071c1efdc9..93064b0a30 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -143,10 +143,11 @@ EXTENDPEVER = "${@['','${PE\x7d:'][bb.data.getVar('PE',d,1) > 0]}" DEBPV = "${EXTENDPEVER}${PV}-${PR}" P = "${PN}-${PV}" -################################################################## -# Distro default -################################################################## -DISTRO_PR ?= "" +# Base package name +# Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial" +# otherwise it is the same as PN and P +BPN = "${@base_package_name(d)}" +BP = "${BPN}-${PV}" # Package info. @@ -217,7 +218,7 @@ FILES_${PN}-locale = "${datadir}/locale" export MANIFEST = "${FILESDIR}/manifest" FILE_DIRNAME = "${@os.path.dirname(bb.data.getVar('FILE', d))}" -FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}" +FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/${BP}:${FILE_DIRNAME}/${BPN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}" FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}" ################################################################## @@ -237,7 +238,7 @@ STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PF}" WORKDIR = "${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PF}" T = "${WORKDIR}/temp" D = "${WORKDIR}/image" -S = "${WORKDIR}/${P}" +S = "${WORKDIR}/${BP}" B = "${S}" STAGING_DIR = "${TMPDIR}/staging" diff --git a/conf/checksums.ini b/conf/checksums.ini index c1ac6ccd1f..2033571ac7 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -4438,6 +4438,10 @@ sha256=176611c4d88d742ea4013991ad54c2f9d2feefbc97a28434c0f48922ebaa8bac md5=85bb8ee345fc41c218de19dda0164806 sha256=90825b05b675890bd405767a973d3c8c90eae36d22a7be6307e07a2e3c760d89 +[http://downloads.sourceforge.net/giflib/giflib-4.1.6.tar.bz2] +md5=7125644155ae6ad33dbc9fc15a14735f +sha256=e1c1ced9c5bc8f93ef0faf0a8c7717abf784d10a7b270d2285e8e1f3b93f2bed + [http://downloads.sourceforge.net/gift/gift-0.11.4.tar.bz2] md5=decc82159c6723be999b1306a808077f sha256=68149059b807b2fac505e376c18320e64104fbe0190e359f98059e73a63693dc @@ -7194,6 +7198,10 @@ sha256=a73727c9c2e15d6302cf4f5d3aaf8378c5de9d60a302b9d5fa4ee5332341f867 md5=c7affcc61d4135ee838121a57b08de0f sha256=dae915b7f963762385df2f4660eaad497261fa72393ba69339530e5b0b5d8bc3 +[http://downloads.sourceforge.net/jamvm/jamvm-1.4.5.tar.gz] +md5=3f538bab6e1c77aed331e5e71f754f5b +sha256=f329d1c8f42c06b53a3e82763d33900b100b8e9acd7afe02f7583c51253fd6e5 + [http://downloads.sourceforge.net/jamvm/jamvm-1.5.0.tar.gz] md5=a965452442cdbfc94caba57d0dd25a8f sha256=18b269b1bfad7230384681e89189c6af18584e19cddbf92208c0acef814046ab @@ -7466,6 +7474,10 @@ sha256=f532fcd61b012379d3258196a8588fd9d51ecdfb5c795485ab2f78d439b103b4 md5=b6d7ca9e9740286f0ce918da9fb8438b sha256=0ee6a3caee4812827b8e167d4a07dbf859cb08a00a20f09568c3baae379d6ce8 +[http://downloads.sourceforge.net/lesstif/lesstif-0.95.0.tar.bz2] +md5=ab895165c149d7f95843c7584b1c7ad4 +sha256=2a6f20d3bd525e6066ba2be22d8a47bf4bcd0425 + [ftp://ftp.wiretapped.net/pub/mirrors/lftp/old/lftp-3.5.1.tar.bz2] md5=c6d48782cdad4759000bf7cd24555723 sha256=463f0b46ce3a0fc09ef9ad7a5429959034d50a1eadbed5dfeae36c25dca31130 @@ -15490,6 +15502,10 @@ sha256=cb4909d8753dff7f6ac90a62a61ed1ae68e49ead2dbc60c22673c55bb0e14a36 md5=96830836f64edbb12c248eb84e6b0d18 sha256=b8e200ae66c20897c9aaa80b0044e638a0016d3bdb6e67560fd61f1ef162f305 +[http://downloads.sourceforge.net/wesnoth/wesnoth-1.4.5.tar.bz2] +md5=09b7b76d4a4eedf502f38df9d551d827 +sha256=6abc3f0c9bee10dfe890c3691542ecae053908da + [ftp://ftp.gnu.org/gnu/wget/wget-1.9.1.tar.gz] md5=e6051f1e1487ec0ebfdbda72bedc70ad sha256=69044b87c517b986dbc17a5f7e4de430cb56e605330c19c6bb0d384d5c37e638 |