From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6891203156929150976 X-Received: by 2002:a19:857:: with SMTP id 84mr486062lfi.237.1604652693430; Fri, 06 Nov 2020 00:51:33 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9b9a:: with SMTP id z26ls113662lji.7.gmail; Fri, 06 Nov 2020 00:51:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJy1Tm9M8LH2YedobwRBlj9Utvl9s8nwKaTqLXn1u49CE2soNXitNjQcXNKlxjKXbxALJpWU X-Received: by 2002:a2e:89d8:: with SMTP id c24mr373520ljk.435.1604652691955; Fri, 06 Nov 2020 00:51:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604652691; cv=none; d=google.com; s=arc-20160816; b=C/Jj/FPbHFSnElnbYnYqzA1DNx2RNCYXROSjt8SQwAfyl5zWWZrvOHCwDjT1p7dpC5 5fkbbbkTz/Cx25GE6ukhEa9MjjNLbJumERgfR5SR4eHtCU2vHtPsEfSIL4FGyeBArw5l 9DHNLKjmOD8zdhWjB6+o7M7juMv3hnFPU9u8jA6e7jYrf7YUjs/wikiljG0BicDUIdXy NxllkbghWMayL7OSGSDSL51vxeUYg7kuIIQh7jPu6Hq6UGB1LFFuf+711Kv0oeA6/wfb 1GRwqrT8vJ0awikJZC7cqkV9W0LNeD0p/7G9RBPaHv0MCgOePvxl1Jq/JPk3zESdAa6g Eueg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject; bh=JV15uJ5K60O7VFexrR8fyK3xls2ItkLid5SZgX8DRBA=; b=Gt3GdN4ylFlX06rnKLX8jMuIc+4QNsUjPQZ+bumz20XLnYQWtBvN1JZJO37QFFkWSP oCeZJq3d0DLNi8NMgWqxerMCFZo0dtPqphNzpuSOafiEnwHI5vwCZen9G7ebWofbaYys iWIyGhqpigXr4O9qPxgH2oRiAHN0wCM7uFK8mRiDsUk/QbIYH0qZG6nFlBac1Ki0U4lA u7oiOYKGEnBhASlgj1K4qX6uZo7M5UXF496IGHU4PsFFc0tQTw8VwwuOThwFARfbwGm1 zWU3FxVkzKfu27Amr1xfi9z1BysBjNYbYso5qLO19sFv4BvcFNzx5zaoZczsAJGGMOT7 f1kg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id v24si19846lfo.5.2020.11.06.00.51.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Nov 2020 00:51:31 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 0A68pVto017629 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 6 Nov 2020 09:51:31 +0100 Received: from [167.87.41.231] ([167.87.41.231]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 0A68pUk3029032 for ; Fri, 6 Nov 2020 09:51:31 +0100 Subject: Re: [PATCH v5] u-boot: Deprecate BUILD_DEPENDS in favor of DEBIAN_BUILD_DEPENDS To: isar-users References: <20201105142911.GL5078@yssyq.m.ilbers.de> From: Jan Kiszka Message-ID: Date: Fri, 6 Nov 2020 09:51:30 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: <20201105142911.GL5078@yssyq.m.ilbers.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: Xo949A7nkknn On 05.11.20 15:29, Baurzhan Ismagulov wrote: > On Wed, Nov 04, 2020 at 10:47:42AM +0100, Jan Kiszka wrote: >> Aligns this recipe with deb_debianize. Provide a compat path along with >> a warning to ease migration. > > Hmm, git am 13.txt failed for me: > > Applying: u-boot: Deprecate BUILD_DEPENDS in favor of DEBIAN_BUILD_DEPENDS > error: corrupt patch at line 35 > Patch failed at 0001 u-boot: Deprecate BUILD_DEPENDS in favor of DEBIAN_BUILD_DEPENDS > hint: Use 'git am --show-current-patch' to see the failed patch > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > > patch -p1 <13.txt failed as well: > > patching file RECIPE-API-CHANGELOG.md > patching file meta/recipes-bsp/u-boot/files/debian/control.tmpl > patch: **** malformed patch at line 183: diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc > > I've rebased v4 and applied to next as below. After a quick check, all changes > seem to be in, but you might want to check as well. > Thanks for fixing up! I rebased locally, and that went smoothly. Apparently, I have local tooling issue with routing out my patches. Jan -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux