[PATCH] meta/classes/debianize: Create debian folder if source does not contain one

16 views
Skip to first unread message

Michael Ebel

unread,
Sep 29, 2021, 10:43:41 AM9/29/21
to isar-users
From e4f8153bd3b3886b283ea19517b56f5190ca6b9a Mon Sep 17 00:00:00 2001
From: Michael Ebel <me...@christ-es.de>
Date: Wed, 29 Sep 2021 16:29:40 +0200
Subject: [PATCH] meta/classes/debianize: Create debian folder if source does
 not contain one

Signed-off-by: Michael Ebel <me...@christ-es.de>
---
 meta/classes/debianize.bbclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/classes/debianize.bbclass b/meta/classes/debianize.bbclass
index 4486778..338b1f5 100644
--- a/meta/classes/debianize.bbclass
+++ b/meta/classes/debianize.bbclass
@@ -88,6 +88,11 @@ EOF
 }
 
 deb_debianize() {
+    # create the debian folder if the source does not contain it
+    if [ ! -d ${S}/debian ]; then
+        install -v -m 755 -d ${S}/debian
+    fi
+
     # create the compat-file if there is no file with that name in WORKDIR
     if [ -f ${WORKDIR}/compat ]; then
         install -v -m 644 ${WORKDIR}/compat ${S}/debian/compat
--
2.25.1

Anton Mikanovich

unread,
Sep 29, 2021, 11:53:57 AM9/29/21
to Michael Ebel, isar-users
Using flag `task_function[cleandirs] += "${S}/debian"` looks much cleaner.
You can look at meta-isar/recipes-app/samefile/samefile_2.14.bb for the
reference.

--
Anton Mikanovich
Promwad Ltd.
External service provider of ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn, Germany
+49 (89) 122 67 24-0
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov

Henning Schild

unread,
Oct 4, 2021, 12:19:35 PM10/4/21
to Michael Ebel, isar-users
Am Wed, 29 Sep 2021 07:43:41 -0700 (PDT)
schrieb Michael Ebel <me...@christ-es.de>:

> From e4f8153bd3b3886b283ea19517b56f5190ca6b9a Mon Sep 17 00:00:00 2001
> From: Michael Ebel <me...@christ-es.de>
> Date: Wed, 29 Sep 2021 16:29:40 +0200
> Subject: [PATCH] meta/classes/debianize: Create debian folder if
> source does not contain one

These double headers look a little weird. Let us use if they cause fun
for "git am". Might be a product of not using "git-send-email".

> Signed-off-by: Michael Ebel <me...@christ-es.de>
> ---
> meta/classes/debianize.bbclass | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/meta/classes/debianize.bbclass
> b/meta/classes/debianize.bbclass index 4486778..338b1f5 100644
> --- a/meta/classes/debianize.bbclass
> +++ b/meta/classes/debianize.bbclass
> @@ -88,6 +88,11 @@ EOF
> }
>
> deb_debianize() {
> + # create the debian folder if the source does not contain it

The code is too obvious to ask for an explanation.

> + if [ ! -d ${S}/debian ]; then

Can be done without condition, install will not complain when already
there

> + install -v -m 755 -d ${S}/debian

no need to -v

Henning

Henning Schild

unread,
Oct 4, 2021, 12:25:30 PM10/4/21
to Anton Mikanovich, Michael Ebel, isar-users
Am Wed, 29 Sep 2021 18:53:52 +0300
schrieb Anton Mikanovich <ami...@ilbers.de>:
In general using cleandirs is probably the nicer solution, but that is
on recipe level and depends on whether one really wants it to be
cleaned. You can also imagine "SRC_URI = file:///debian" where a
pre-filled folder is fetched and that task should not clean.

So the patch is valid, there is code placing files in a potentially
non-existing directory, which should be created on demand.

Henning


Michael Ebel

unread,
Oct 5, 2021, 2:02:01 AM10/5/21
to isar-users
> These double headers look a little weird. Let us use if they cause fun
> for "git am". Might be a product of not using "git-send-email".

I used plain "git format-patch". I also checked that the patch does apply properly with "git am".
But anyway based on your feedback I will gladly submit a v2 with "git-send-email".

Michael
Reply all
Reply to author
Forward
0 new messages