From c4971d7143c488aeb357090ff916f51644d20ef0 Mon Sep 17 00:00:00 2001
From: Walter Lozano <walter.lozano@collabora.com>
Date: Fri, 7 Mar 2025 20:01:01 -0300
Subject: [PATCH 01/10] check-for-dod: Improve output
To make the output for the script ready to be used for other script generate
a sorted list with unique source package names.
Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
---
rebase-scripts/check-for-dod | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rebase-scripts/check-for-dod b/rebase-scripts/check-for-dod
index 78a655e2..ded6cb2b 100755
--- a/rebase-scripts/check-for-dod
+++ b/rebase-scripts/check-for-dod
@@ -10,4 +10,4 @@ cat build-deps.txt | sed 's,.*name="\([^"]*\)".*,\1,g' | sort | uniq > missing-
for x in $(cat missing-bd) ; do
apt-cache showsrc $x | grep 'Package:' | head -n1
-done > missing-bd-source
+done | cut -d' ' -f2 | sort | uniq > missing-bd-source
--
GitLab
From 90529c6d4e7e58010da0006a67a65702fed93917 Mon Sep 17 00:00:00 2001
From: Walter Lozano <walter.lozano@collabora.com>
Date: Fri, 7 Mar 2025 20:03:19 -0300
Subject: [PATCH 02/10] check-for-dod: Switch to v2026dev2 as default release
Aligning with the rebase on top of Debian Trixie, switch the default
release to v2026dev2.
Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
---
rebase-scripts/check-for-dod | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rebase-scripts/check-for-dod b/rebase-scripts/check-for-dod
index ded6cb2b..33d587b7 100755
--- a/rebase-scripts/check-for-dod
+++ b/rebase-scripts/check-for-dod
@@ -1,6 +1,6 @@
#!/bin/sh
-branch=${RELEASE:=v2025dev2}
+branch=${RELEASE:=v2026dev2}
for x in $(osc ls apertis:${branch}:target) ; do
osc buildinfo apertis:${branch}:target ${x} default x86_64
--
GitLab
From 89718ff93777df6bba18971455b2b18955bf00b1 Mon Sep 17 00:00:00 2001
From: Walter Lozano <walter.lozano@collabora.com>
Date: Tue, 11 Mar 2025 10:23:48 -0300
Subject: [PATCH 03/10] check-for-dod: Extend to all the components
To retrieve all the information, extend the script to include all the
components. While doing that align in the name of the files used.
Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
---
rebase-scripts/check-for-dod | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/rebase-scripts/check-for-dod b/rebase-scripts/check-for-dod
index 33d587b7..2502953e 100755
--- a/rebase-scripts/check-for-dod
+++ b/rebase-scripts/check-for-dod
@@ -1,13 +1,20 @@
#!/bin/sh
+COMPONENTS="target development sdk non-free"
branch=${RELEASE:=v2026dev2}
-for x in $(osc ls apertis:${branch}:target) ; do
- osc buildinfo apertis:${branch}:target ${x} default x86_64
-done | grep Debian | grep bdep > build-deps.txt
+rm -f all-missing-bd-source.txt
-cat build-deps.txt | sed 's,.*name="\([^"]*\)".*,\1,g' | sort | uniq > missing-bd
+for c in $COMPONENTS ; do
+ for x in $(osc ls apertis:${branch}:$c) ; do
+ osc buildinfo apertis:${branch}:$c ${x} default x86_64
+ done | grep Debian | grep bdep > $c-build-deps.txt
-for x in $(cat missing-bd) ; do
- apt-cache showsrc $x | grep 'Package:' | head -n1
-done | cut -d' ' -f2 | sort | uniq > missing-bd-source
+ cat $c-build-deps.txt | sed 's,.*name="\([^"]*\)".*,\1,g' | sort | uniq > $c-missing-bd.txt
+
+ for x in $(cat $c-missing-bd.txt) ; do
+ apt-cache showsrc $x | grep 'Package:' | head -n1
+ done | cut -d' ' -f2 | sort | uniq > $c-missing-bd-source.txt
+
+ cat $c-missing-bd-source.txt >> all-missing-bd-source.txt
+done
--
GitLab
From 4d338b251fc97bf51f668fa735dd353aaf2f1a66 Mon Sep 17 00:00:00 2001
From: Walter Lozano <walter.lozano@collabora.com>
Date: Tue, 11 Mar 2025 10:27:32 -0300
Subject: [PATCH 04/10] check-for-dod: Pass release as argument
To improve flexibility and align with other scripts pass the release as
argument.
Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
---
rebase-scripts/check-for-dod | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/rebase-scripts/check-for-dod b/rebase-scripts/check-for-dod
index 2502953e..298fe5d7 100755
--- a/rebase-scripts/check-for-dod
+++ b/rebase-scripts/check-for-dod
@@ -1,13 +1,23 @@
-#!/bin/sh
+#!/bin/bash
COMPONENTS="target development sdk non-free"
-branch=${RELEASE:=v2026dev2}
+RELEASE=${RELEASE:=v2026dev2}
+
+while getopts 'r:' opt
+do
+ case "$opt" in
+ r)
+ RELEASE=$OPTARG
+ ;;
+ esac
+done
+shift "$(($OPTIND -1))"
rm -f all-missing-bd-source.txt
for c in $COMPONENTS ; do
- for x in $(osc ls apertis:${branch}:$c) ; do
- osc buildinfo apertis:${branch}:$c ${x} default x86_64
+ for x in $(osc ls apertis:${RELEASE}:$c) ; do
+ osc buildinfo apertis:${RELEASE}:$c ${x} default x86_64
done | grep Debian | grep bdep > $c-build-deps.txt
cat $c-build-deps.txt | sed 's,.*name="\([^"]*\)".*,\1,g' | sort | uniq > $c-missing-bd.txt
--
GitLab
From d4171ebdf2d32f861d1fa17629f0d5f8d194eb57 Mon Sep 17 00:00:00 2001
From: Walter Lozano <walter.lozano@collabora.com>
Date: Fri, 14 Mar 2025 15:12:48 -0300
Subject: [PATCH 05/10] check-for-dod: Exit on error
In order to be aware of errors which may not be noticed, just exit.
Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
---
rebase-scripts/check-for-dod | 2 ++
1 file changed, 2 insertions(+)
diff --git a/rebase-scripts/check-for-dod b/rebase-scripts/check-for-dod
index 298fe5d7..4c7105fd 100755
--- a/rebase-scripts/check-for-dod
+++ b/rebase-scripts/check-for-dod
@@ -3,6 +3,8 @@
COMPONENTS="target development sdk non-free"
RELEASE=${RELEASE:=v2026dev2}
+set -e
+
while getopts 'r:' opt
do
case "$opt" in
--
GitLab
From b3085feba4d751976fa93020b90c623e8aff1748 Mon Sep 17 00:00:00 2001
From: Walter Lozano <walter.lozano@collabora.com>
Date: Fri, 14 Mar 2025 15:16:18 -0300
Subject: [PATCH 06/10] check-for-dod: Show information about the progress
The check-for-dod can take long hours, so it is really useful to show
some hints about the progress.
Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
---
rebase-scripts/check-for-dod | 2 ++
1 file changed, 2 insertions(+)
diff --git a/rebase-scripts/check-for-dod b/rebase-scripts/check-for-dod
index 4c7105fd..5c93767c 100755
--- a/rebase-scripts/check-for-dod
+++ b/rebase-scripts/check-for-dod
@@ -19,12 +19,14 @@ rm -f all-missing-bd-source.txt
for c in $COMPONENTS ; do
for x in $(osc ls apertis:${RELEASE}:$c) ; do
+ echo Getting buildinfo for $c $x >&2
osc buildinfo apertis:${RELEASE}:$c ${x} default x86_64
done | grep Debian | grep bdep > $c-build-deps.txt
cat $c-build-deps.txt | sed 's,.*name="\([^"]*\)".*,\1,g' | sort | uniq > $c-missing-bd.txt
for x in $(cat $c-missing-bd.txt) ; do
+ echo Getting source for $c $x >&2
apt-cache showsrc $x | grep 'Package:' | head -n1
done | cut -d' ' -f2 | sort | uniq > $c-missing-bd-source.txt
--
GitLab
From 888a1f247e0b24f5a96da924cddc2cd1d1b6079e Mon Sep 17 00:00:00 2001
From: Walter Lozano <walter.lozano@collabora.com>
Date: Tue, 18 Mar 2025 09:19:08 -0300
Subject: [PATCH 07/10] check-for-dod: Extend to capture all the build deps
In order to generate different types of report extend the script to
generate the list of all the build dependencies. In this other tools
can compute reports about the progress of the rebase.
Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
---
rebase-scripts/check-for-dod | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/rebase-scripts/check-for-dod b/rebase-scripts/check-for-dod
index 5c93767c..feb8ee41 100755
--- a/rebase-scripts/check-for-dod
+++ b/rebase-scripts/check-for-dod
@@ -5,7 +5,7 @@ RELEASE=${RELEASE:=v2026dev2}
set -e
-while getopts 'r:' opt
+while getopts 'r:s' opt
do
case "$opt" in
r)
@@ -15,20 +15,29 @@ do
done
shift "$(($OPTIND -1))"
-rm -f all-missing-bd-source.txt
+rm -f all-all-bd-source.txt all-debian-bd-source.txt
for c in $COMPONENTS ; do
for x in $(osc ls apertis:${RELEASE}:$c) ; do
echo Getting buildinfo for $c $x >&2
osc buildinfo apertis:${RELEASE}:$c ${x} default x86_64
- done | grep Debian | grep bdep > $c-build-deps.txt
+ done | grep bdep > $c-all-bd.txt
+ grep Debian $c-all-bd.txt > $c-debian-bd.txt
+ cat $c-all-bd.txt | sed 's,.*name="\([^"]*\)".*,\1,g' | sort -u | sponge $c-all-bd.txt
+ cat $c-debian-bd.txt | sed 's,.*name="\([^"]*\)".*,\1,g' | sort -u | sponge $c-debian-bd.txt
+done
- cat $c-build-deps.txt | sed 's,.*name="\([^"]*\)".*,\1,g' | sort | uniq > $c-missing-bd.txt
+for c in $COMPONENTS ; do
+ for x in $(cat $c-all-bd.txt) ; do
+ echo Getting source for $c $x >&2
+ apt-cache showsrc $x | grep 'Package:' | head -n1
+ done | cut -d' ' -f2 | sort | uniq > $c-all-bd-source.txt
- for x in $(cat $c-missing-bd.txt) ; do
+ for x in $(cat $c-debian-bd.txt) ; do
echo Getting source for $c $x >&2
- apt-cache showsrc $x | grep 'Package:' | head -n1
- done | cut -d' ' -f2 | sort | uniq > $c-missing-bd-source.txt
+ apt-cache showsrc $x | grep 'Package:' | head -n1
+ done | cut -d' ' -f2 | sort | uniq > $c-debian-bd-source.txt
- cat $c-missing-bd-source.txt >> all-missing-bd-source.txt
+ cat $c-all-bd-source.txt >> all-all-bd-source.txt
+ cat $c-debian-bd-source.txt >> all-debian-bd-source.txt
done
--
GitLab
From 0788fdf3717c5702011a5405c57e245847adb061 Mon Sep 17 00:00:00 2001
From: Walter Lozano <walter.lozano@collabora.com>
Date: Tue, 18 Mar 2025 09:21:38 -0300
Subject: [PATCH 08/10] check-for-dod: Rename script to show new functionality
Since the functionality of the script has been extended, rename it to
reflect that.
Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
---
rebase-scripts/{check-for-dod => get-obs-bd} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename rebase-scripts/{check-for-dod => get-obs-bd} (100%)
diff --git a/rebase-scripts/check-for-dod b/rebase-scripts/get-obs-bd
similarity index 100%
rename from rebase-scripts/check-for-dod
rename to rebase-scripts/get-obs-bd
--
GitLab
From 86f769703d886ad4cd70716cef63b9cccf122290 Mon Sep 17 00:00:00 2001
From: Walter Lozano <walter.lozano@collabora.com>
Date: Tue, 18 Mar 2025 15:20:47 -0300
Subject: [PATCH 09/10] get-obs-bd: Use sort to filter unique values
Instead of calling a new process to filter unique values use sort.
Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
---
rebase-scripts/get-obs-bd | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rebase-scripts/get-obs-bd b/rebase-scripts/get-obs-bd
index feb8ee41..c45c84ca 100755
--- a/rebase-scripts/get-obs-bd
+++ b/rebase-scripts/get-obs-bd
@@ -31,12 +31,12 @@ for c in $COMPONENTS ; do
for x in $(cat $c-all-bd.txt) ; do
echo Getting source for $c $x >&2
apt-cache showsrc $x | grep 'Package:' | head -n1
- done | cut -d' ' -f2 | sort | uniq > $c-all-bd-source.txt
+ done | cut -d' ' -f2 | sort -u > $c-all-bd-source.txt
for x in $(cat $c-debian-bd.txt) ; do
echo Getting source for $c $x >&2
apt-cache showsrc $x | grep 'Package:' | head -n1
- done | cut -d' ' -f2 | sort | uniq > $c-debian-bd-source.txt
+ done | cut -d' ' -f2 | sort -u > $c-debian-bd-source.txt
cat $c-all-bd-source.txt >> all-all-bd-source.txt
cat $c-debian-bd-source.txt >> all-debian-bd-source.txt
--
GitLab
From dd89a5fde0d6c1f8b5f1c41f1bf879467705ab56 Mon Sep 17 00:00:00 2001
From: Walter Lozano <walter.lozano@collabora.com>
Date: Tue, 18 Mar 2025 15:21:53 -0300
Subject: [PATCH 10/10] get-obs-bd: Sort all the reports
Some reports were not sorted, causing confusion, so let's sort them all.
Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
---
rebase-scripts/get-obs-bd | 3 +++
1 file changed, 3 insertions(+)
diff --git a/rebase-scripts/get-obs-bd b/rebase-scripts/get-obs-bd
index c45c84ca..b5aae1f1 100755
--- a/rebase-scripts/get-obs-bd
+++ b/rebase-scripts/get-obs-bd
@@ -41,3 +41,6 @@ for c in $COMPONENTS ; do
cat $c-all-bd-source.txt >> all-all-bd-source.txt
cat $c-debian-bd-source.txt >> all-debian-bd-source.txt
done
+
+sort -u -o all-all-bd-source.txt{,}
+sort -u -o all-debian-bd-source.txt{,}
\ No newline at end of file
--
GitLab