From 2a28c5d6b77564b0ffd1545f87ad34367d4d2ac1 Mon Sep 17 00:00:00 2001 From: Andreas Cord-Landwehr Date: Sat, 7 Aug 2021 16:07:48 +0200 Subject: [PATCH] Correctly support git tag usage For plasma-mobile we have the situation that apps are not all organized in a single invent group but scattered over several KDE modules. For solving this, just use the legacy anongit:// URL rewrite support with hopefully will stay for still quite a few years. --- recipes-plasma-mobile/alligator.inc | 2 -- recipes-plasma-mobile/calindori.inc | 2 -- recipes-plasma-mobile/kasts.inc | 2 -- recipes-plasma-mobile/kclock.inc | 2 -- recipes-plasma-mobile/koko.inc | 2 -- recipes-plasma-mobile/kongress.inc | 2 -- recipes-plasma-mobile/krecorder.inc | 2 -- recipes-plasma-mobile/ktrip.inc | 2 -- recipes-plasma-mobile/kweather.inc | 2 -- scripts/plasma-mobile-release.sh | 2 ++ 10 files changed, 2 insertions(+), 18 deletions(-) diff --git a/recipes-plasma-mobile/alligator.inc b/recipes-plasma-mobile/alligator.inc index 4456122..b167ddd 100644 --- a/recipes-plasma-mobile/alligator.inc +++ b/recipes-plasma-mobile/alligator.inc @@ -16,8 +16,6 @@ DEPENDS = " \ plasma-framework \ " -SRC_URI ?= "git://invent.kde.org/plasma-mobile/${BPN};nobranch=1;protocol=https" - inherit cmake_kdeapp inherit kconfig inherit kcoreaddons diff --git a/recipes-plasma-mobile/calindori.inc b/recipes-plasma-mobile/calindori.inc index 1babc84..648b0d3 100644 --- a/recipes-plasma-mobile/calindori.inc +++ b/recipes-plasma-mobile/calindori.inc @@ -16,8 +16,6 @@ DEPENDS = " \ plasma-framework \ " -SRC_URI ?= "git://invent.kde.org/plasma-mobile/${BPN};nobranch=1;protocol=https" - inherit cmake_kdeapp inherit kconfig inherit mime-xdg diff --git a/recipes-plasma-mobile/kasts.inc b/recipes-plasma-mobile/kasts.inc index e1d3726..0e2c7b2 100644 --- a/recipes-plasma-mobile/kasts.inc +++ b/recipes-plasma-mobile/kasts.inc @@ -19,8 +19,6 @@ DEPENDS = " \ ki18n \ " -SRC_URI ?= "git://invent.kde.org/plasma-mobile/${BPN};nobranch=1;protocol=https" - inherit cmake_kdeapp inherit kconfig inherit kcoreaddons diff --git a/recipes-plasma-mobile/kclock.inc b/recipes-plasma-mobile/kclock.inc index a7563c0..7432069 100644 --- a/recipes-plasma-mobile/kclock.inc +++ b/recipes-plasma-mobile/kclock.inc @@ -20,8 +20,6 @@ DEPENDS = " \ plasma-framework \ " -SRC_URI ?= "git://invent.kde.org/plasma-mobile/${BPN};nobranch=1;protocol=https" - inherit cmake_kdeapp inherit kconfig inherit kcoreaddons diff --git a/recipes-plasma-mobile/koko.inc b/recipes-plasma-mobile/koko.inc index dcb62f1..2090845 100644 --- a/recipes-plasma-mobile/koko.inc +++ b/recipes-plasma-mobile/koko.inc @@ -21,8 +21,6 @@ DEPENDS = " \ exiv2 \ " -SRC_URI ?= "git://invent.kde.org/graphics/${BPN};nobranch=1;protocol=https" - inherit cmake_kdeapp inherit kconfig inherit kcoreaddons diff --git a/recipes-plasma-mobile/kongress.inc b/recipes-plasma-mobile/kongress.inc index 99bd286..fe02a8d 100644 --- a/recipes-plasma-mobile/kongress.inc +++ b/recipes-plasma-mobile/kongress.inc @@ -18,7 +18,5 @@ DEPENDS = " \ knotifications \ " -SRC_URI ?= "git://invent.kde.org/utilities/${BPN};nobranch=1;protocol=https" - inherit cmake_kdeapp inherit kconfig diff --git a/recipes-plasma-mobile/krecorder.inc b/recipes-plasma-mobile/krecorder.inc index b3b128f..aa18a5e 100644 --- a/recipes-plasma-mobile/krecorder.inc +++ b/recipes-plasma-mobile/krecorder.inc @@ -16,7 +16,5 @@ DEPENDS = " \ kirigami \ " -SRC_URI ?= "git://invent.kde.org/plasma-mobile/${BPN};nobranch=1;protocol=https" - inherit cmake_kdeapp inherit kconfig diff --git a/recipes-plasma-mobile/ktrip.inc b/recipes-plasma-mobile/ktrip.inc index 8b25b7e..7cd3471 100644 --- a/recipes-plasma-mobile/ktrip.inc +++ b/recipes-plasma-mobile/ktrip.inc @@ -19,8 +19,6 @@ DEPENDS = " \ kpublictransport \ " -SRC_URI ?= "git://invent.kde.org/utilities/${BPN};nobranch=1;protocol=https" - inherit cmake_kdeapp inherit kconfig inherit kcoreaddons diff --git a/recipes-plasma-mobile/kweather.inc b/recipes-plasma-mobile/kweather.inc index 4cd8129..da889e4 100644 --- a/recipes-plasma-mobile/kweather.inc +++ b/recipes-plasma-mobile/kweather.inc @@ -21,8 +21,6 @@ DEPENDS = " \ kweathercore \ " -SRC_URI ?= "git://invent.kde.org/plasma-mobile/${BPN};nobranch=1;protocol=https" - inherit cmake_kdeapp inherit kconfig inherit kcoreaddons diff --git a/scripts/plasma-mobile-release.sh b/scripts/plasma-mobile-release.sh index 2276766..85c9bcc 100755 --- a/scripts/plasma-mobile-release.sh +++ b/scripts/plasma-mobile-release.sh @@ -25,11 +25,13 @@ case $command in add) for recipe in `find $base -name "*.inc" | grep -v /staging/`; do name=`echo $recipe | sed -e "s,\.inc,_${version}.bb,"` + app=$(echo $recipe | grep -P -o '[0-9a-zA-Z\-]+(?=\.inc)') cat < $name # SPDX-FileCopyrightText: none # SPDX-License-Identifier: CC0-1.0 require \${PN}.inc +SRC_URI = "git://anongit.kde.org/${app};nobranch=1;protocol=https" SRCREV = "v\${PV}" S = "\${WORKDIR}/git" EOM