public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Henning Schild <henning.schild@siemens.com>
To: Cedric Hombourger <Cedric_Hombourger@mentor.com>
Cc: <isar-users@googlegroups.com>
Subject: Re: [PATCH 4/4] patch: suffix patch files copied to .applied_patches with "~"
Date: Mon, 21 Oct 2019 13:26:52 +0200	[thread overview]
Message-ID: <20191021132652.2de4c080@md1za8fc.ad001.siemens.net> (raw)
In-Reply-To: <1571650494-572-5-git-send-email-Cedric_Hombourger@mentor.com>

I think that whole patching keeps the files so we can roll back and i
think Jan wanted to somehow continue working on it using quilt.

Renaming that file might break that, did you check?

I guess we could introduce a test for parts of that by adding a patch
to the hello recipe.

Henning

Am Mon, 21 Oct 2019 11:34:54 +0200
schrieb Cedric Hombourger <Cedric_Hombourger@mentor.com>:

> When patches are applied to a source Debian package, patches
> specified in SRC_URI get copied to ${S}/.applied_patches (as
> intended) but dpkg-source then believes the source tree was modified
> and exits with an error. Make dpkg-source ignore patch files that
> were copied by this class by appending a "~" suffix to them.
> 
> Signed-off-by: Cedric Hombourger <Cedric_Hombourger@mentor.com>
> ---
>  meta/classes/patch.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass
> index c5ba463..1d8041f 100644
> --- a/meta/classes/patch.bbclass
> +++ b/meta/classes/patch.bbclass
> @@ -54,7 +54,7 @@ python do_patch() {
>  
>              cmds = open(applied_patches_dir + ".patch-commands", "a")
>  
> -            patch_file = applied_patches_dir + path
> +            patch_file = applied_patches_dir + path + "~"
>              bb.utils.mkdirhier(os.path.dirname(patch_file))
>              shutil.copyfile(workdir + path, patch_file)
>  


  reply	other threads:[~2019-10-21 11:26 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-21  9:34 [PATCH 0/4] miscellaneous (minor) fixes Cedric Hombourger
2019-10-21  9:34 ` [PATCH 1/4] wic-img: do not leave temporary files behind Cedric Hombourger
2019-10-21  9:34 ` [PATCH 2/4] isar-bootstrap: wipe out previously created rootfs with --one-file-system Cedric Hombourger
2019-10-21  9:34 ` [PATCH 3/4] base-apt-helper: fixed a few typos found in comments Cedric Hombourger
2019-10-21  9:34 ` [PATCH 4/4] patch: suffix patch files copied to .applied_patches with "~" Cedric Hombourger
2019-10-21 11:26   ` Henning Schild [this message]
2019-10-21 11:36     ` Cedric Hombourger
2019-10-21 12:43       ` Henning Schild
2019-10-21 12:53         ` Cedric Hombourger
2019-10-21 15:08           ` [PATCH v2 0/5] miscellaneous (minor) fixes Cedric Hombourger
2019-10-21 15:08             ` [PATCH v2 1/5] wic-img: do not leave temporary files behind Cedric Hombourger
2019-10-21 15:08             ` [PATCH v2 2/5] isar-bootstrap: wipe out previously created rootfs with --one-file-system Cedric Hombourger
2019-10-21 15:08             ` [PATCH v2 3/5] base-apt-helper: fixed a few typos found in comments Cedric Hombourger
2019-10-21 15:08             ` [PATCH v2 4/5] patch: suffix patch files copied to .applied_patches with "~" Cedric Hombourger
2019-10-21 15:10             ` [PATCH v2 5/5] hello: add a sample patch to exercise patch.bbclass against dpkg recipes Cedric Hombourger
2019-10-25 17:15       ` [PATCH 4/4] patch: suffix patch files copied to .applied_patches with "~" Jan Kiszka
2019-10-25 17:58         ` Cedric Hombourger
2019-11-05 12:52           ` [PATCH v3 0/6] miscellaneous (minor) fixes Cedric Hombourger
2019-11-05 12:53             ` [PATCH v3 1/6] wic-img: do not leave temporary files behind Cedric Hombourger
2019-11-05 12:53             ` [PATCH v3 2/6] isar-bootstrap: wipe out previously created rootfs with --one-file-system Cedric Hombourger
2019-11-05 12:53             ` [PATCH v3 3/6] base-apt-helper: fixed a few typos found in comments Cedric Hombourger
2019-11-05 12:53             ` [PATCH v3 4/6] ci_build.sh: delay "set -x" for a clean --help output Cedric Hombourger
2019-11-05 12:53             ` [PATCH v3 5/6] linux-custom: honor KERNEL_FILE setting Cedric Hombourger
2019-11-05 12:53             ` [PATCH v3 6/6] bitbake.conf: set name of the qemu-static binary to use for mipsel Cedric Hombourger
2019-11-08  9:23             ` [PATCH v4 - misc fixes 0/6] miscellaneous (minor) fixes Cedric Hombourger
2019-11-08  9:23               ` [PATCH v4 - misc fixes 1/6] wic-img: do not leave temporary files behind Cedric Hombourger
2019-11-15 13:38                 ` Jan Kiszka
2019-11-15 13:42                   ` Cedric Hombourger
2019-11-15 17:00                   ` [PATCH v5 0/6] miscellaneous (minor) fixes Cedric Hombourger
2019-11-15 17:00                     ` [PATCH v5 1/6] wic-img: do not leave temporary files behind Cedric Hombourger
2019-11-15 17:00                     ` [PATCH v5 2/6] isar-bootstrap: wipe out previously created rootfs with --one-file-system Cedric Hombourger
2019-11-15 17:00                     ` [PATCH v5 3/6] base-apt-helper: fixed a few typos found in comments Cedric Hombourger
2019-11-15 17:00                     ` [PATCH v5 4/6] ci_build.sh: delay "set -x" for a clean --help output Cedric Hombourger
2019-11-15 17:00                     ` [PATCH v5 5/6] linux-custom: honor KERNEL_FILE setting Cedric Hombourger
2019-11-15 17:00                     ` [PATCH v5 6/6] bitbake.conf: set name of the qemu-static binary to use for mipsel Cedric Hombourger
2019-11-20 12:39                     ` [PATCH v5 0/6] miscellaneous (minor) fixes Baurzhan Ismagulov
2019-11-08  9:23               ` [PATCH v4 - misc fixes 2/6] isar-bootstrap: wipe out previously created rootfs with --one-file-system Cedric Hombourger
2019-11-08  9:23               ` [PATCH v4 - misc fixes 3/6] base-apt-helper: fixed a few typos found in comments Cedric Hombourger
2019-11-08  9:23               ` [PATCH v4 - misc fixes 4/6] ci_build.sh: delay "set -x" for a clean --help output Cedric Hombourger
2019-11-08  9:24               ` [PATCH v4 - misc fixes 5/6] linux-custom: honor KERNEL_FILE setting Cedric Hombourger
2019-11-08  9:24                 ` [PATCH v4 - misc fixes 6/6] bitbake.conf: set name of the qemu-static binary to use for mipsel Cedric Hombourger
2019-11-12 19:20               ` [PATCH v4 - misc fixes 0/6] miscellaneous (minor) fixes chombourger
2019-11-14 17:01                 ` Baurzhan Ismagulov
2019-11-15 16:59                   ` chombourger
2019-11-19 16:56                     ` Baurzhan Ismagulov
2019-11-15 13:34               ` chombourger
2019-11-15 13:39                 ` Baurzhan Ismagulov
2019-11-15 13:39                 ` Jan Kiszka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191021132652.2de4c080@md1za8fc.ad001.siemens.net \
    --to=henning.schild@siemens.com \
    --cc=Cedric_Hombourger@mentor.com \
    --cc=isar-users@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox