From patchwork Fri Mar 9 18:55:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131222 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1343155lja; Fri, 9 Mar 2018 11:04:30 -0800 (PST) X-Google-Smtp-Source: AG47ELv5S4jxtAD7VCghzcanKUxIAwpnLpjzg3QXoWwKLhs7kWxVDZrlZqciqwn6zdIRWZ/UBdoF X-Received: by 2002:a17:902:e65:: with SMTP id 92-v6mr28673297plw.268.1520622270010; Fri, 09 Mar 2018 11:04:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622270; cv=none; d=google.com; s=arc-20160816; b=YxQrhJ74CdHJpJyfXR4P7cAzD6mSdY2TSsCcUyn1qD1Da3S2hB63iM0SzNTk1YERHK Fx0uLot8rmYwboSHDdTOFk81wR6ezaTu6pZC/7+qILaLtCzNJ7DYqOSgfWyDCVcon9xU YTQLOtD3+taYeDF30zR1i5zuvD801NV6Y7ebgeCeEHLTmoMEzzgLzsJQ5T5KKPzBC3tO VN9A7NpAaZqBiWPc+LnfXsw5f0qG3Z4vv8LTU8sI8NFg/ifS5WptV950RW9/9B9UGtg8 pf16kGTzTv2mRv+rVMkxCjAjK1GJDEbBe0UlkNr4sdY/zwP2U6SH0ClBr3rEH4eamvLS jN5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=hmWH/GqUiGsE6P0qTsgCmWt/SryUwc4rUu3I33pGY0g=; b=x0BBb3R/XvAPbtYK7MpAHSkKqNOIWU+MVnm234YL7Mgv9YLz+yGxLGF+CJqsoQWGFH lltceor3AYpr/zr+lKW1ITpDt0O7JOyO4JmOSCKC2bq9QF5TX8Cza8F120agsCrQKV5S ENC6tKGMr+W1xzTR3nEMrOxtZgfl1A6MppQ0kzyV/xsHZbloaK6mMzoOg624IqZUEVAC gI2uIDl8MRG4GFzFwuLEebcNbf5Lzd5ZLS+K9dnNz/JJaeKgwz+9fV8bajF2+JKhc/nO wXWttM4sOGvA87zEiXB3fSvpVsnSI6Kqle/izKOrF6DunBTsG5sgjyCAzdGXrioj2pvY rbaQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id m1-v6si1390253pli.332.2018.03.09.11.04.29; Fri, 09 Mar 2018 11:04:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 66FEE78988; Fri, 9 Mar 2018 19:03:25 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mail.openembedded.org (Postfix) with ESMTP id 9DBDC7892F for ; Fri, 9 Mar 2018 19:03:07 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Mar 2018 11:03:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32651928" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:08 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:55:50 +0200 Message-Id: <20180309185614.31113-12-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180309185614.31113-1-alexander.kanavin@linux.intel.com> References: <20180309185614.31113-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 12/36] opkg-utils: refresh patches X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Ross Burton The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. Signed-off-by: Ross Burton Signed-off-by: Alexander Kanavin --- ...ly-use-sort-name-on-versions-of-tar-which-support-.patch | 13 +++++-------- ...kg-build-Use-local-time-for-build_date-since-opkg-.patch | 13 +++++-------- 2 files changed, 10 insertions(+), 16 deletions(-) -- 2.16.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch index 7de4b7f723c..203c5850533 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch @@ -11,10 +11,10 @@ Signed-off-by: Alejandro del Castillo opkg-build | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) -diff --git a/opkg-build b/opkg-build -index 265906f..094d69f 100755 ---- a/opkg-build -+++ b/opkg-build +Index: opkg-utils-0.3.6/opkg-build +=================================================================== +--- opkg-utils-0.3.6.orig/opkg-build ++++ opkg-utils-0.3.6/opkg-build @@ -232,6 +232,11 @@ if [ $compressor = "gzip" ] ; then compressorargs=$zipargs fi @@ -40,13 +40,10 @@ index 265906f..094d69f 100755 echo "2.0" > $tmp_dir/debian-binary @@ -296,7 +301,7 @@ rm -f $pkg_file if [ "$outer" = "ar" ] ; then - ( cd $tmp_dir && ar -crfD $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext ) + ( cd $tmp_dir && ar -crf $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext ) else - ( cd $tmp_dir && tar -c --sort=name --mtime=$build_date $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file ) + ( cd $tmp_dir && tar -c $tsortargs --mtime=$build_date $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file ) fi rm $tmp_dir/debian-binary $tmp_dir/data.tar.$cext $tmp_dir/control.tar.gz --- -2.16.1 - diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch index b42d7878c9b..0a7403d6747 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch @@ -12,10 +12,10 @@ Signed-off-by: Alejandro del Castillo opkg-build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/opkg-build b/opkg-build -index 094d69f..0050c2b 100755 ---- a/opkg-build -+++ b/opkg-build +Index: opkg-utils-0.3.6/opkg-build +=================================================================== +--- opkg-utils-0.3.6.orig/opkg-build ++++ opkg-utils-0.3.6/opkg-build @@ -282,11 +282,11 @@ fi tmp_dir=$dest_dir/IPKG_BUILD.$$ mkdir $tmp_dir @@ -33,13 +33,10 @@ index 094d69f..0050c2b 100755 echo "2.0" > $tmp_dir/debian-binary @@ -301,7 +301,7 @@ rm -f $pkg_file if [ "$outer" = "ar" ] ; then - ( cd $tmp_dir && ar -crfD $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext ) + ( cd $tmp_dir && ar -crf $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext ) else - ( cd $tmp_dir && tar -c $tsortargs --mtime=$build_date $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file ) + ( cd $tmp_dir && tar -c $tsortargs --mtime="$build_date" $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file ) fi rm $tmp_dir/debian-binary $tmp_dir/data.tar.$cext $tmp_dir/control.tar.gz --- -2.16.1 -