diff options
| author |   Richard Purdie <rpurdie@linux.intel.com> | 2008-10-27 19:41:57 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2008-10-27 19:41:57 +0000 |
| commit | 5c9fa982d6457efdef97063a96cfa0d4910cdf5c (patch) | |
| tree | 425112bcff74d8611442b3cdc1de8193320f2aad | |
| parent | 51955f706a0f92149e32f69ce67ab65f5f4f03ed (diff) | |
| parent | 24db7b9bb0aedf06122e14a1ab77e4b541b2df68 (diff) | |
| download | openembedded-5c9fa982d6457efdef97063a96cfa0d4910cdf5c.tar.gz | |
Merge branch 'org.openembedded.dev' of ssh://git@git.openembedded.net/openembedded
| -rw-r--r-- | conf/bitbake.conf | 9 | ||||
| -rwxr-xr-x | contrib/weekly-changelog-report.py | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 6207e5be50..edb4e4ddbc 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -139,9 +139,8 @@ 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}" +EXTENDPV = "${EXTENDPEVER}${PV}-${PR}${DISTRO_PR}" P = "${PN}-${PV}" -DISTRO_PR ?= "" # Base package name # Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial" @@ -202,14 +201,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} (= ${DEBPV})" +RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPV})" 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} (= ${DEBPV})" +RRECOMMENDS_${PN}-dbg = "${PN} (= ${EXTENDPV})" FILES_${PN}-locale = "${datadir}/locale" @@ -595,6 +594,7 @@ IMAGE_ROOTFS_SIZE_ext2 ?= "65536" IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536" IMAGE_ROOTFS_SIZE_ext3 ?= "65536" IMAGE_ROOTFS_SIZE_ext3.gz ?= "65536" +DISTRO_PR ?= "" # Forcefully set CACHE now so future changes to things like # MACHINE don't change the path to the cache @@ -644,4 +644,3 @@ COMBINED_FEATURES = "\ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}" - diff --git a/contrib/weekly-changelog-report.py b/contrib/weekly-changelog-report.py index b5e70cb5be..101de2919b 100755 --- a/contrib/weekly-changelog-report.py +++ b/contrib/weekly-changelog-report.py @@ -23,6 +23,6 @@ start_day = end_day - datetime.timedelta(7) print "OE weekly changelog %s to %s\n" % (start_day.isoformat(), end_day.isoformat()) -os.system("git-shortlog --since=%s --until=%s | grep -v \"Merge branch\"" % (start_day.isoformat(), end_day.isoformat())) +os.system("git-shortlog --since=%s --until=%s | grep -v \"Merge branch\" | grep -v \"Merge commit\"" % (start_day.isoformat(), end_day.isoformat())) |