[v2] repository: make repo_del_srcpackage delete only source packages

Message ID 20240226070705.12563-1-cedric.hombourger@siemens.com
State Accepted, archived
Headers show
Series [v2] repository: make repo_del_srcpackage delete only source packages | expand

Commit Message

Cedric Hombourger Feb. 26, 2024, 7:07 a.m. UTC
The reprepro removesrc command not only deletes the requested source
package but also any binary packages that were built from it. If
do_deploy_source is recalled after do_deploy_deb, we would see
previously deployed binary packages vanish from isar-apt. This
incoherency was found by running bitbake -fc deploy_source after a
complete build of a recipe.

Signed-off-by: Cedric Hombourger <cedric.hombourger@siemens.com>
---
 meta/classes/repository.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Uladzimir Bely March 11, 2024, 12:07 p.m. UTC | #1
On Mon, 2024-02-26 at 08:07 +0100, 'Cedric Hombourger' via isar-users
wrote:
> The reprepro removesrc command not only deletes the requested source
> package but also any binary packages that were built from it. If
> do_deploy_source is recalled after do_deploy_deb, we would see
> previously deployed binary packages vanish from isar-apt. This
> incoherency was found by running bitbake -fc deploy_source after a
> complete build of a recipe.
> 
> Signed-off-by: Cedric Hombourger <cedric.hombourger@siemens.com>
> ---
>  meta/classes/repository.bbclass | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/classes/repository.bbclass
> b/meta/classes/repository.bbclass
> index a61e5dcd..28e712fd 100644
> --- a/meta/classes/repository.bbclass
> +++ b/meta/classes/repository.bbclass
> @@ -70,8 +70,8 @@ repo_del_srcpackage() {
>      if [ -n "${GNUPGHOME}" ]; then
>          export GNUPGHOME="${GNUPGHOME}"
>      fi
> -    reprepro -b "${dir}" --dbdir "${dbdir}" \
> -        removesrc "${codename}" \
> +    reprepro -b "${dir}" --dbdir "${dbdir}" -A source \
> +        remove "${codename}" \
>          "${packagename}"
>  }
>  
> -- 
> 2.39.2
> 

Applied to next, thanks.

Patch

diff --git a/meta/classes/repository.bbclass b/meta/classes/repository.bbclass
index a61e5dcd..28e712fd 100644
--- a/meta/classes/repository.bbclass
+++ b/meta/classes/repository.bbclass
@@ -70,8 +70,8 @@  repo_del_srcpackage() {
     if [ -n "${GNUPGHOME}" ]; then
         export GNUPGHOME="${GNUPGHOME}"
     fi
-    reprepro -b "${dir}" --dbdir "${dbdir}" \
-        removesrc "${codename}" \
+    reprepro -b "${dir}" --dbdir "${dbdir}" -A source \
+        remove "${codename}" \
         "${packagename}"
 }