From patchwork Tue Jul 28 12:31:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 1 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:ab3:65c3:0:0:0:0:0 with SMTP id m3csp806171lti; Tue, 28 Jul 2020 13:31:59 -0700 (PDT) X-Received: by 2002:a5d:4611:: with SMTP id t17mr24919750wrq.243.1595968319576; Tue, 28 Jul 2020 13:31:59 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1595968319; cv=pass; d=google.com; s=arc-20160816; b=IKcA2MHvTKNKCb071BMqAik0bQrXBM6IGvhJpH6kXWjwzlTRxFwG9ojidU87ovXZiP ufiBB777lYU9YxJG0AgRNvuEdvNl3oh/erGOuf0ROe2rv7Q/ABE73cjtNtdY4hTO9+Wn RWnE0VqsbRlt7lL0v+r0K/hDv3+FyObf00sVVB6fftYS1v8d4MWjXYW5Go4b837sgV9l h/IlEsWycG85pVqDPspBDWJ3vpL2QoYYg8KRpvJ/ybYjw3dmeTAUZA+oh80IkOUci0do grw/wm+NG3oqBiNfivMHkNCDF5av7JiwJtorbDY4lUvabBQxnjXEKq74O9V7KyVdYMbK k/DA== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=PFjz62gVxligIYVON64DbTSdAWKH7UdY3XlwnDRT2kM=; b=oySKsa4ROS3n+SeJI9HpopdZxtS+blKE+bVZlDicI8RqWi2g5uQXOXigL0zUg0IcAq K0nhSSP8NTUI7kWEJIl17bpKaraoAjb+SZW/GhP4/VnL3xMhBH+YgvzTkmitUWRa+XaA m8QePXwReMssUEoG9C7+5cDq0hE8Fsxj/t3nU0x+CshJ2E5lM4DLzi6oDvoBdhOOuidR BB8RIGVH4/3GHzfWd45yhx4PfmqjSR4zd89dT9cc38sW6WlolopHTCMajVUujRI7eXuP +yHLcbKCSA9QmdwnqI9U4CHJ3SmKdIMdXy2iSidbuu4GTcnOfTvsVHf5p7HyXi8PWH9H /6Dw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=eylLxXKA; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbdjmjpgy2mgrbpuwql4qkgqezlchqba@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBDJMJPGY2MGRBPUWQL4QKGQEZLCHQBA@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id g14sor4105484wru.59.2020.07.28.13.31.58 (Google Transport Security); Tue, 28 Jul 2020 13:31:59 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbdjmjpgy2mgrbpuwql4qkgqezlchqba@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=eylLxXKA; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbdjmjpgy2mgrbpuwql4qkgqezlchqba@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBDJMJPGY2MGRBPUWQL4QKGQEZLCHQBA@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1595968318; cv=pass; d=google.com; s=arc-20160816; b=Txeptv14YhqGU4pwzz5xuByg1t5ipnPZ0irHg+spHFUHU78gfZjyDzfSvuDY/LiANX gwfdEybBxWYViGExoIepgRI3i5YhKoYjXn9LqOBGNyMqE+/cot71Rt6Glx+eijNq5sbt pZSjzv6YGYa1Y9/c5cDheBhlntbm2LKJQd4fdzMSuo2Sf+JKmR0FMzOqEN0oEgsbNjF0 QHG41sUy8mgEzisZg3Brq+3ka0F83WearyRGYPL3EBVvxN7/eJa8Sa0jAqacrf5LPGwH lyuuCufF/bggD9QkU2ULyGVVRgUgeytgKAgC0RgTRhNsW91Ijd7OI3GM7fs0/SGkufuR zs1w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=PFjz62gVxligIYVON64DbTSdAWKH7UdY3XlwnDRT2kM=; b=tneW/phkSRn5NnvICpba7DLAy3Wx3Pfpgh2/1CBkvreNRURdRyf9RzUwoFU/Nfaqye 4zTlMAlISvJpwdvvDN6aQVCice4Dw7RL3XyP9LoF70kt5241bKcseeQtduok+6p2ThBu Z2e4+rxZDAmm2Cs/Q/flxMLm0mNVmb8n6H5oYheoDcdoa1uQ5UgffAHo3kKyRDmQW+zA agCTHRA6D/1jslw7U7VNH7r3prC6NpWzB6XLhJvywDn2L9Vfl3/fKEyaqy3C2V1q7l5m gx8g/+y1pfJF3eSKGhYefib2uvE3BcCTChUmhnK1dSEHvTORX7638U3r7jAwmbkVuQQG v2ZQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=PFjz62gVxligIYVON64DbTSdAWKH7UdY3XlwnDRT2kM=; b=eylLxXKAr87JLDDR1sxoAU8KfIH0gLUtmfaslDhfJXVajw4OuG6brPCqc/H9zz/o7L j+Kc44vrQuipJOTZ7C2EMlCekEv447wDRcvRc1U8VGN4/nwTWpwq5bAPpmFfvSFDewNd DRVJfYli3mW61gFCrchX0L9jqSgdl+hrf13aiWEuOzg3hNFHI2vWbe9tzQ+X11YIvJ7Y fhiZ+Tggt+KutVOloKYXovLD9MH+2xAzM+T8X9uf2o5KEl399Wtc39qk0p+sACxZU/P+ BJPBSKBaWYYbATyJ+OLysUvkcQRKflEEjRXWhCbKLhvENiHxzsCn0LjArGXhwfazPN20 Eagg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=PFjz62gVxligIYVON64DbTSdAWKH7UdY3XlwnDRT2kM=; b=eVZWmPx0B03MWU0Hzk1PNe9bij6MkgI/JHS0rQAuhuXZYWvd67H0w7Pvb04VBy8Npd x0axpDDuuWNMYVs0bA0zU13L1eOvsb8PEJNUXyW8k+XqsWkHFNMvjA8eyFmRcl1kBlvY NcMTq0R84w3iJnSX6pzmiTE7CcjfH5QvjhVwqkQXTCEpWxpSw5/mlrrSeZC7CNXIPT/T JNfIgDtrfRifrSexIatBEqzkG/GklHlOReVmSi9A/3IPxiR0AyJFE9DRwezAxPCHX4bh J4/jqN98FkXX9g6Juxmxz8u5Y9tPkWXiBhgl6nfeAmVOemdpyTZCXtYQMCNHfFEabwvh av9Q== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530EGpZpPGPq0eA4VXDck/7IfzzHTREG92twp0y6xFdgSLgK1R/N hjuE831m2GBhtLW/h21KoKs= X-Google-Smtp-Source: ABdhPJztyLF1pVkY+FsMVNVrczOmLdPvFcokJbhGxt8t6NkPDmuLb0QuuUOB2WkhT/jOYhi195mWVA== X-Received: by 2002:adf:eecb:: with SMTP id a11mr26978182wrp.339.1595968318544; Tue, 28 Jul 2020 13:31:58 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:48c1:: with SMTP id v184ls2092679wma.1.gmail; Tue, 28 Jul 2020 13:31:58 -0700 (PDT) X-Received: by 2002:a7b:c8c9:: with SMTP id f9mr5845957wml.40.1595968318087; Tue, 28 Jul 2020 13:31:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595968318; cv=none; d=google.com; s=arc-20160816; b=gDJHhEJrtM6KOwdjoXI7Kq3K8L1gE1vSwsNG54bYN5vvLSbKqSrinzugIYijKoYQiv NGSX+kWXOBdVAfjNeNBSezz83iyF7PloxwxjsF8xqD4FYBFDp0rc52/41SOvUZ0zDUrD WSEZ8ZUF5FzSbDq6aAvb4hkKBtT0GJBnPfJrVnhENvNQeQlFKVkXDt3PLoAI3ONQVteX R8TwS56rEHAdiY69cMJLGejU/PSz8qxHK04YzqLvlqhmHQQ2Q9gcth0+J/0y+GE7KEoM fhsuLo+VWv/3WvTuua4c5SNfVSpKpSOjdhfV20lBmWCx/oh9kZE1f9GGz3ivnUhdNU/c RZnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=/+pgEH+mxZlXBsYBzHM6qgiuv8WdVEMJAkfVFT8zP/4=; b=G171Ss4909Ho+fMAFUwVQQ8Gv/S5QhNqyPywFGb2lT0IHz/vCAKR3a62nynVimIUKw OV0831PkODCPmZ7ElvhvRjc68wv+2huhhdS0rvApKwQwkFn05CmWa3H3V3/CRPL17iyN YN8Ad3Thh0dbbH6CQwOZobQLhHs/X1Mhc826lmHMI6Iq/KBnSl3k3uJJnhsXS2KxpQVi LIyII+iLZSfZeQMRCF4le05qCrY1RKnLswEKlqBGm0VG/iVnkb5+2D0XiHk6OlhIfoRy kyXRyPtH3gDcHfLYh2h2Bz/3ocjPt5Un1mVQ1dxnTl5/fmhAqc1xcyMeYYd6JBIxxV0n ktjw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id m3si544wme.0.2020.07.28.13.31.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jul 2020 13:31:58 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 06SKVvqO011245 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 28 Jul 2020 22:31:57 +0200 Received: from localhost.localdomain ([158.92.8.82]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 06SKVv8o000918; Tue, 28 Jul 2020 22:31:57 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH 1/2] patch: special-case quilt in debian Date: Tue, 28 Jul 2020 22:31:52 +0200 Message-Id: <20200728203153.792-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1673494076971030716?= X-GMAIL-MSGID: =?utf-8?q?1673494076971030716?= From: Henning Schild The OE patch lib uses quilt and so do many debian packages as well. Those two do not work well together, it is really hard to create a patch that will apply and not break what debian does later. debian is very pedantic about unexpected changes so even if patching works, building might not. Introduce a special-case where we detect quilt usage of a debian package and hook in there. Also make sure we are on top of debian so we do not risk breaking patches we inherit from there. If anyone ever managed to create a patch that works well in the face of two quilts, that might break with this change. You can set PATCHTOOL to "quilt" in your recipe to disable the magic. Signed-off-by: Henning Schild --- meta/classes/patch.bbclass | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index 3060755a5c..06f32a2197 100644 --- a/meta/classes/patch.bbclass +++ b/meta/classes/patch.bbclass @@ -91,6 +91,28 @@ def should_apply(parm, d): should_apply[vardepsexclude] = "DATE SRCDATE" +def patch_do_debian_quilt(patchdir, d): + import oe.patch + class DummyPatchSet(oe.patch.PatchSet): + def Clean(self): + True + + def Import(self, patch, force): + os.putenv('QUILT_PATCHES', 'debian/patches') + # push all so we are on top of debian + pushed = False + if os.path.exists(os.path.join(self.dir, 'debian/patches/series')): + oe.patch.runcmd(["quilt", "push", "-a"], self.dir) + pushed = True + oe.patch.runcmd(["quilt", "import", "-f", os.path.join(d.getVar('WORKDIR'), os.path.basename(patch['file']))], self.dir) + if pushed: + oe.patch.runcmd(["quilt", "pop", "-a"], self.dir) + + def Push(self, force = False): + True + + return DummyPatchSet(patchdir, d) + python patch_do_patch() { import sys @@ -118,6 +140,12 @@ python patch_do_patch() { s = d.getVar('S') + debianformat = os.path.join(s, 'debian/source/format') + if os.path.exists(debianformat) and d.getVar('PATCHTOOL') != 'quilt': + with open(debianformat, 'r+') as f: + if f.readline() == '3.0 (quilt)\n': + cls = patch_do_debian_quilt + os.putenv('PATH', d.getVar('PATH')) # We must use one TMPDIR per process so that the "patch" processes