From patchwork Mon Oct 26 18:13:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannu Nyman X-Patchwork-Id: 536145 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0FBD61402C4 for ; Tue, 27 Oct 2015 05:13:44 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 0095428089D; Mon, 26 Oct 2015 19:11:48 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00 autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 7B6DE280640 for ; Mon, 26 Oct 2015 19:11:37 +0100 (CET) X-policyd-weight: using cached result; rate: -5.5 Received: from filtteri2.pp.htv.fi (filtteri2.pp.htv.fi [213.243.153.185]) by arrakis.dune.hu (Postfix) with ESMTP for ; Mon, 26 Oct 2015 19:11:37 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by filtteri2.pp.htv.fi (Postfix) with ESMTP id 942D019BF42; Mon, 26 Oct 2015 20:13:18 +0200 (EET) X-Virus-Scanned: Debian amavisd-new at pp.htv.fi Received: from smtp5.welho.com ([213.243.153.39]) by localhost (filtteri2.pp.htv.fi [213.243.153.185]) (amavisd-new, port 10024) with ESMTP id c9zA7eOjyhGC; Mon, 26 Oct 2015 20:13:15 +0200 (EET) Received: from localhost.localdomain (87-100-236-80.bb.dnainternet.fi [87.100.236.80]) by smtp5.welho.com (Postfix) with ESMTP id 1DA6E5BC00A; Mon, 26 Oct 2015 20:13:15 +0200 (EET) From: Hannu Nyman To: openwrt-devel@lists.openwrt.org Date: Mon, 26 Oct 2015 20:13:01 +0200 Message-Id: <1445883181-22135-1-git-send-email-hannu.nyman@iki.fi> X-Mailer: git-send-email 2.5.0 Cc: Hannu Nyman Subject: [OpenWrt-Devel] [PATCH] tools/quilt: update to 0.64 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Update quilt to version 0.64. Changelog: http://git.savannah.gnu.org/cgit/quilt.git/tree/NEWS?id=v0.64 Refresh patches. (scripts/inspect.in has been removed upstream) Signed-off-by: Hannu Nyman --- Version 0.64 (Mon Feb 09 2015) - Check for series file consistency - Performance: Several optimizations - Test suite: Several fixes and coverage improvements - Test suite: Run the tests in predictable order - files: Add support for unapplied patches - graph: Check for graphviz availability - mail: Remove procmail dependency - mail: Don't include the release number in User-Agent - pop: Add --refresh option - push: Add --refresh option - push: Do not use interactive mode with -f - setup: Skip version check - setup: Check for rpmbuild availability - setup: Handle long options passed to tar - setup: Several cleanups and minor fixes - setup: Major performance optimizations - setup: Fix path to extra patches in series file - setup: Trace calls earlier - setup: Add --fast option - setup: Fix link creation - quilt.el: Fix tramp support - quilt.el: Fix patch select completion --- tools/quilt/Makefile | 6 +++--- tools/quilt/patches/000-relocatable.patch | 17 +---------------- tools/quilt/patches/001-fix_compile.patch | 2 +- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/tools/quilt/Makefile b/tools/quilt/Makefile index c2dbc07..939ba69 100644 --- a/tools/quilt/Makefile +++ b/tools/quilt/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2014 OpenWrt.org +# Copyright (C) 2006-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=quilt -PKG_VERSION:=0.63 +PKG_VERSION:=0.64 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SAVANNAH/quilt -PKG_MD5SUM:=c0ef4beb58a6fa72563b955e70624b6e +PKG_MD5SUM:=fc0310db5868a0873d602d4332a76d43 include $(INCLUDE_DIR)/host-build.mk diff --git a/tools/quilt/patches/000-relocatable.patch b/tools/quilt/patches/000-relocatable.patch index aedb914..ed4f00a 100644 --- a/tools/quilt/patches/000-relocatable.patch +++ b/tools/quilt/patches/000-relocatable.patch @@ -45,21 +45,6 @@ textdomain("quilt"); sub _($) { ---- a/quilt/scripts/inspect.in -+++ b/quilt/scripts/inspect.in -@@ -6,7 +6,11 @@ - # - # See the COPYING and AUTHORS files for more details. - --: ${QUILT_DIR=@QUILT_DIR@} -+if test -n "$STAGING_DIR"; then -+ : ${QUILT_DIR="$STAGING_DIR/../host/share/quilt"} -+else -+ : ${QUILT_DIR=@QUILT_DIR@} -+fi - - if ! [ -r $QUILT_DIR/scripts/patchfns ] - then --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in @@ -8,7 +8,11 @@ @@ -116,7 +101,7 @@ MKTEMP := @MKTEMP@ MSGMERGE := @MSGMERGE@ MSGFMT := @MSGFMT@ -@@ -49,8 +49,8 @@ USE_NLS := @USE_NLS@ +@@ -48,8 +48,8 @@ USE_NLS := @USE_NLS@ STAT_HARDLINK := @STAT_HARDLINK@ PATCH_WRAPPER := @PATCH_WRAPPER@ diff --git a/tools/quilt/patches/001-fix_compile.patch b/tools/quilt/patches/001-fix_compile.patch index c829515..3ce93f0 100644 --- a/tools/quilt/patches/001-fix_compile.patch +++ b/tools/quilt/patches/001-fix_compile.patch @@ -1,6 +1,6 @@ --- a/Makefile.in +++ b/Makefile.in -@@ -272,13 +272,10 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu +@@ -271,13 +271,10 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu @$(if $(filter $@,$(NON_EXEC_IN)),,chmod +x $@) configure : configure.ac aclocal.m4