From patchwork Sat Oct 5 02:42:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1172098 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="N9/77e9s"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46lWHz0fw1z9sPJ for ; Sat, 5 Oct 2019 12:42:54 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 687F02040D; Sat, 5 Oct 2019 02:42:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jTrnr3gUpxyF; Sat, 5 Oct 2019 02:42:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id D285F2041B; Sat, 5 Oct 2019 02:42:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 55F951BF863 for ; Sat, 5 Oct 2019 02:42:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 511C287E1F for ; Sat, 5 Oct 2019 02:42:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OP4h-D2jMWVt for ; Sat, 5 Oct 2019 02:42:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7F1F787E0E for ; Sat, 5 Oct 2019 02:42:47 +0000 (UTC) Received: by mail-qk1-f193.google.com with SMTP id p10so7662190qkg.8 for ; Fri, 04 Oct 2019 19:42:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jukBIOVtw/W5p7HKLXR/qoVUJEajM3bMZlil1yVOfIU=; b=N9/77e9sHlijivpUEpYih2kbjrOBbTk176XhgLlKM/BPuuKUJG+xbTfxgx0c4aZkFZ EW6M40njpP9372+ieNXyjSxN5TjfJlReQh/4koDIYX8rvohwCg9IAoJOu3pPXSCFBtt5 azAAJ2AoPeXaBMcWtQUoRxFHGvMvCfU3xp+41DUx9o2mhQg1ZescrmA4lnEMqIr9O8NH +TVj+AYx9yZvIMBVdG12swRDmzOCYm+iu4cGnTQrJVJBgffpVQbcVDDLpvp9hxR1DBd9 b73qpWYWZ7ZoTyluIHkPTpUqvT/OkAFVcdlXEsCXbBzlTblv6e4BAF/S/1k3B/CECKO8 ebew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jukBIOVtw/W5p7HKLXR/qoVUJEajM3bMZlil1yVOfIU=; b=tfj8nAV3G9iTgOmOp35AEE7IsvEMt4mGA6XoM5gG3tTTJk1y+zOjEkFZKXJK6bz7h0 e+nyQaPtqam6KK9S/bhyoN2d1KR3IXVls1SfdkUzKZ7mPGmZHM3h9vU4F9Y9IsGnN3Wf lrjJKA/3oiJUUrRDAsKx/TLftmoe97IoBmaCaSkhwR+oxOirm/hyipV6XtMpJxBk4OlL n21648WklHmcJH9+6oYiPuVu/Z3yV405ttR3gFtjBEuZCqHCVD9EQRgT6Amp1me2gpN/ ZFbFsNskXytNz6mSQPfGT2dxG7FYzsPGdMP4ynJF86J/+meFuGwF5iRDpqKMGEmHVvgV C93Q== X-Gm-Message-State: APjAAAU1G+XwU0+UO0W/xoysNxMS74UG5CWeuZJCUmhEFXTuWJKHpDK2 k02LWhw4BEKE/tr+2N9JwlPi1bv+ X-Google-Smtp-Source: APXvYqzH07I50vQ3GeAWkeTLhpAIuNPxBm2pjn+7zweUzaCFKpv714d2W1jISfWQTXuuTEv3VTE8dw== X-Received: by 2002:a37:4ecb:: with SMTP id c194mr13208618qkb.126.1570243366213; Fri, 04 Oct 2019 19:42:46 -0700 (PDT) Received: from casantos.remote.csb ([177.132.211.198]) by smtp.gmail.com with ESMTPSA id u132sm3989720qka.50.2019.10.04.19.42.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Oct 2019 19:42:45 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Fri, 4 Oct 2019 23:42:29 -0300 Message-Id: <20191005024230.25287-2-unixmania@gmail.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20191005024230.25287-1-unixmania@gmail.com> References: <20191005024230.25287-1-unixmania@gmail.com> Subject: [Buildroot] [PATCH 1/2] package/cups-filters: drop pre-configure hook X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Carlos Santos , Olivier Schonken , Peter Korsgaard MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos Version 1.25.6 contains the config.rpath and ABOUT-NLS, so it wouldn't be necessary to fake them even if we still used autoreconf. Signed-off-by: Carlos Santos --- CC: Peter Korsgaard --- package/cups-filters/cups-filters.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk index 88b7d7dd06..ffd55fa95d 100644 --- a/package/cups-filters/cups-filters.mk +++ b/package/cups-filters/cups-filters.mk @@ -20,14 +20,6 @@ CUPS_FILTERS_CONF_OPTS = --disable-imagefilters \ --with-pdftops=pdftops \ --with-jpeg -# After 0002-filter-texttotext.c-link-with-libiconv-if-needed.patch autoreconf -# needs config.rpath and ABOUT-NLS, which are not in v1.25.4 yet. Fake them. -define CUPS_FILTERS_ADD_MISSING_FILE - touch $(@D)/config.rpath $(@D)/ABOUT-NLS -endef - -CUPS_FILTERS_PRE_CONFIGURE_HOOKS = CUPS_FILTERS_ADD_MISSING_FILE - ifeq ($(BR2_PACKAGE_LIBPNG),y) CUPS_FILTERS_CONF_OPTS += --with-png CUPS_FILTERS_DEPENDENCIES += libpng From patchwork Sat Oct 5 02:42:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1172099 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Kf1LJbh/"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46lWJ00Qf0z9sCJ for ; Sat, 5 Oct 2019 12:42:55 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id BBF5886C6D; Sat, 5 Oct 2019 02:42:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qme9vqiCmpNY; Sat, 5 Oct 2019 02:42:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 11AE186C1E; Sat, 5 Oct 2019 02:42:53 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 0EA8D1BF863 for ; Sat, 5 Oct 2019 02:42:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 07CFC86C1E for ; Sat, 5 Oct 2019 02:42:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OW4RqhLAsrGX for ; Sat, 5 Oct 2019 02:42:50 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by fraxinus.osuosl.org (Postfix) with ESMTPS id CE5E286BFE for ; Sat, 5 Oct 2019 02:42:49 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id o12so11388929qtf.3 for ; Fri, 04 Oct 2019 19:42:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IU3uX9W+lYlyBTyz7GncyItKDu5Ohq2pEHJsbpu7/CU=; b=Kf1LJbh/CdKmX98eWZ0XeHREe7E9NibS6fIpvZU4QPfZTgDGxaWnScF7G4WFIA4Air Jabsr6mR9Zjfn/AxJOcA+itVkxiwaR8JLYT7e25OVvmlPeFbBW8l+vJLIKAuGrzl+10Z aeIzneZYP1km3vBi6k2Q0ztrJbD1z2rpX5itbe5rl5dofzjpAcLhCPA67fKp2x69W2SK p6pF8FgGnCq44ww0NmQaMVLZOB2YdVUvJ1cDGX117y4982SzaGwcrv/wEUT/re079Bgz sOjqs65fD38Ei0G9Ixo1x7TIO9xa4XiL4DkGk7iEIZtsw4Gfc9GeF/cVr8BVpi9/I7k7 qOKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IU3uX9W+lYlyBTyz7GncyItKDu5Ohq2pEHJsbpu7/CU=; b=ODWhR9RNOJ1A8PAHEBdDvzBefITgOadLfL42njBv1mfDT5+x+qlgG7NZQmf017Hu6j BT4yKENaoBqK5NVleQcCOkyiChyPh74QYJIzwpCE8MZt9DM0riMPGe+oKWD9cM7vEeZj Rr2GQe6PR++dhD5CHm6Kk3vIFsVvZK6uobmQMdaY4NvzccF14l92o42jTrk2jN3NmkL3 ulsjvdVWCaDp6UBcLjvYXJ+qcf7hGTYZ7/2UXayP/yMIlVdueEwoDcBl2nBuOwxo9EOp rqCbMnaW54Gh4/XLOsmuoztjpiMpmRR7Mw3N/BBXyUNaoaoqHiE271wjV4jVGcTplbW/ rmXw== X-Gm-Message-State: APjAAAVuWgp2WDHfW245364OW/6IrMMnUmJ3y1brSsuwDod3TpW3fH/N I16iZrIQ7X25sTxtoUn61mLGJ3QC X-Google-Smtp-Source: APXvYqzMyES9lgMckNugcwC9mBmjSR5yneRa3RIbGzjJeVgliX4Ttjcytg4D6IwGyI/Jzi8mu2Cq9g== X-Received: by 2002:ac8:5344:: with SMTP id d4mr19727105qto.258.1570243368719; Fri, 04 Oct 2019 19:42:48 -0700 (PDT) Received: from casantos.remote.csb ([177.132.211.198]) by smtp.gmail.com with ESMTPSA id u132sm3989720qka.50.2019.10.04.19.42.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Oct 2019 19:42:48 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Fri, 4 Oct 2019 23:42:30 -0300 Message-Id: <20191005024230.25287-3-unixmania@gmail.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20191005024230.25287-1-unixmania@gmail.com> References: <20191005024230.25287-1-unixmania@gmail.com> Subject: [Buildroot] [PATCH 2/2] package/cups-filters: fix ln -r workaround for older distributions X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Carlos Santos , Olivier Schonken , Peter Korsgaard MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos Add a patch to create the ln-srf script that was not included in the 1.25.6 release tarball. Also add a post-patch hook to ensure that the script executable, since but GNU patch < 2.7 does not handle the git patch permission extensions. Fixes: http://autobuild.buildroot.net/results/c78e7d6d703b1b48ba19d8c4fae32b4e4489cb43/ Signed-off-by: Carlos Santos --- CC: Peter Korsgaard --- ...ild-system-add-missing-ln-srf-script.patch | 71 +++++++++++++++++++ package/cups-filters/cups-filters.mk | 9 +++ 2 files changed, 80 insertions(+) create mode 100644 package/cups-filters/0001-Build-system-add-missing-ln-srf-script.patch diff --git a/package/cups-filters/0001-Build-system-add-missing-ln-srf-script.patch b/package/cups-filters/0001-Build-system-add-missing-ln-srf-script.patch new file mode 100644 index 0000000000..bdc431d8f3 --- /dev/null +++ b/package/cups-filters/0001-Build-system-add-missing-ln-srf-script.patch @@ -0,0 +1,71 @@ +From 6f6fb88077bce7f9dd9d21a286eeec700acff04e Mon Sep 17 00:00:00 2001 +From: Carlos Santos +Date: Mon, 16 Sep 2019 22:22:37 -0300 +Subject: [PATCH] Build system:: add missing ln-srf script + +It is missing in the 1.25.6 release tarball. + +Signed-off-by: Carlos Santos +--- + ln-srf | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 49 insertions(+) + create mode 100755 ln-srf + +diff --git a/ln-srf b/ln-srf +new file mode 100755 +index 00000000..f395a760 +--- /dev/null ++++ b/ln-srf +@@ -0,0 +1,49 @@ ++#!/bin/sh ++# ++# Author: Carlos Santos ++# This file is in public domain. ++# ++ ++error() { ++ echo "$@" 1>&2 ++ exit 1 ++} ++ ++src="$1" ++dst="$2" ++ ++check_path() { ++ case "$2" in ++ */../*|*/./*|*/.|*/..) error "$1 path '$2' must be absolute";; ++ */) error "$1 path '$2' must not end with '/'";; ++ /?*) ;; ++ *) error "$1 path '$2' must start with '/'";; ++ esac ++} ++ ++check_path "source" "$src" ++check_path "destination" "$dst" ++ ++# strip leading '/' ++src=${src#/*} ++tmp=${dst#/*} ++ ++s_prefix=${src%%/*} ++d_prefix=${tmp%%/*} ++ ++# strip leading common ++while [ "$s_prefix" = "$d_prefix" ]; do ++ src="${src#$s_prefix/}" ++ tmp="${tmp#$d_prefix/}" ++ s_prefix=${src%%/*} ++ d_prefix=${tmp%%/*} ++done ++ ++s_prefix="../" ++while [ -n "$d_prefix" ] && [ "$tmp" != "$d_prefix" ]; do ++ s_prefix="../$s_prefix" ++ tmp="${tmp#$d_prefix/}" ++ d_prefix=${tmp%%/*} ++done ++ ++ln -s -f "$s_prefix$src" "$dst" +-- +2.18.1 + diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk index ffd55fa95d..76fc1afb28 100644 --- a/package/cups-filters/cups-filters.mk +++ b/package/cups-filters/cups-filters.mk @@ -20,6 +20,15 @@ CUPS_FILTERS_CONF_OPTS = --disable-imagefilters \ --with-pdftops=pdftops \ --with-jpeg +# 0001-Build-system-add-missing-ln-srf-script.patch adds a ln-srf script +# for older distributions, but GNU patch < 2.7 does not handle the git +# patch permission extensions - So ensure it is executable +define CUPS_FILTERS_MAKE_LN_SRF_EXECUTABLE + chmod +x $(@D)/ln-srf +endef + +CUPS_FILTERS_POST_PATCH_HOOKS += CUPS_FILTERS_MAKE_LN_SRF_EXECUTABLE + ifeq ($(BR2_PACKAGE_LIBPNG),y) CUPS_FILTERS_CONF_OPTS += --with-png CUPS_FILTERS_DEPENDENCIES += libpng