mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-06 21:02:20 +00:00
be8c765c7c
There is new patch-status QA check in oe-core: https://git.openembedded.org/openembedded-core/commit/?id=76a685bfcf927593eac67157762a53259089ea8a This is temporary work around just to hide _many_ warnings from optional patch-status (if you add it to WARN_QA). This just added Upstream-Status: Pending everywhere without actually investigating what's the proper status. This is just to hide current QA warnings and to catch new .patch files being added without Upstream-Status, but the number of Pending patches is now terrible: 5 (26%) meta-xfce 6 (50%) meta-perl 15 (42%) meta-webserver 21 (36%) meta-gnome 25 (57%) meta-filesystems 26 (43%) meta-initramfs 45 (45%) meta-python 47 (55%) meta-multimedia 312 (63%) meta-networking 756 (61%) meta-oe Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
Upstream-Status: Pending
|
|
|
|
When WORKDIR is included in some other git checkout, version.sh calls git rev-parse
|
|
and it returns some description from that upper git checkout even when rfkill is
|
|
being built from release tarball.
|
|
|
|
When returned description doesn't match with expected v0.4, version.sh exits
|
|
without creating version.c
|
|
# on git builds check that the version number above
|
|
# is correct...
|
|
[ "${descr%%-*}" = "v$VERSION" ] || exit 2
|
|
|
|
and build fails a bit later:
|
|
| NOTE: make -j 32 -e MAKEFLAGS=
|
|
| CC rfkill.o
|
|
| GEN version.c
|
|
| make: *** [version.c] Error 2
|
|
| make: *** Waiting for unfinished jobs....
|
|
| ERROR: oe_runmake failed
|
|
|
|
Don't try git rev-parse, if there isn't .git in ${S}.
|
|
|
|
--- a/version.sh 2013-11-15 03:43:12.587744366 -0800
|
|
+++ b/version.sh 2013-11-15 03:42:40.699743320 -0800
|
|
@@ -12,7 +12,7 @@
|
|
|
|
if test "x$SUFFIX" != 'x'; then
|
|
v="$VERSION$SUFFIX"
|
|
-elif head=`git rev-parse --verify HEAD 2>/dev/null`; then
|
|
+elif test -d .git && head=`git rev-parse --verify HEAD 2>/dev/null`; then
|
|
git update-index --refresh --unmerged > /dev/null
|
|
descr=$(git describe 2>/dev/null || echo "v$VERSION")
|
|
|