From patchwork Wed May 22 07:02:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3114 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 15A523F9F8 for ; Wed, 22 May 2024 09:02:54 +0200 (CEST) Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-578280daf12sf448669a12.1 for ; Wed, 22 May 2024 00:02:54 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361373; cv=pass; d=google.com; s=arc-20160816; b=uyHjU1JjAytqb7jzkldW5lw+hB7dtx3PB+XdOYoiGzCVLkLN+ZTZ47MMOJVLib6qNr AKImFncjCGbvZJjlRbinry826tHB+ReT834JydN9Sughbs2rEPKBFL/UKz0hepa2WgJB nyeMAY3060u6BxCnOYSetByAciOyTsUCFbxNDkvU5O9g+QZ0fcs+xhvxa1+PAlNHuJxg 8XWHuRHe08sIrl6IUcYvW0bHpWv35pGLDz+IrFnrdTef0CxGe+owI+k4F3zni/RiSMGe XOGv+QAK7pcp0KgSl5LuW/A+Zp6tIq63O6Yv23h4IDRni6HHY66vELSQNF/ldYmZ+f0e iVZQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=GFEiftG1xswaPLBZM1XRMDlLy1cRaZvxLAluXudSEbg=; fh=QELMMibWcDXhLTqzergJr39F0emyMKauiQLfsHrORO8=; b=02iqGQ1UQqUtMqtfKDBiLVvVMUcpzON/7ZSnWTLhvQf7+i9Yz6I2K7BnjYLf3EOjSM PAZOAcsQEjNeYw2J6cbLaPW9/cJ7lo7QDp8BGPgYWAjbHJYLvRkqbUT1AKQHfRWLzr8C 6vIT0sBIg405fNpQNx4qmXq1prgAID2U7Y0eRhOJ5RSDxPEJ27gRLaQWSHKQSL1ga+jV c7frN2XMp4gU3QDAJgQtfvEIIO3ScN/sWrmMUw90eThUbheZIR62WCVrkU8dYD8r+8bf tEo0TSMXSweK5/JpVVIiv/+FQbgZxiS6G6PHUtBuwnfkWytSpNNT2NTJkD/Gkw82YyQ4 acjg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=H7HKdZeB; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1716361373; x=1716966173; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=GFEiftG1xswaPLBZM1XRMDlLy1cRaZvxLAluXudSEbg=; b=bVpyW/q9sCMeUY2kX3VyJe4vCmFR+PxcDyzACRr1pyRQ/0ts0tebkbhvGb6WUu7i0w LBDik9KaGkj6P1cXBwTVa1+5yQtZv8FABNkWMxQD+skNx28J09w74blGFcPH1ek/zE9w l23v9iF8MUYOPM4qx8ykKl8HwpVxqI/2VV6qU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361373; x=1716966173; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=GFEiftG1xswaPLBZM1XRMDlLy1cRaZvxLAluXudSEbg=; b=afZCqwPf1PspmIAICXXGzE6aX9yK4Q288uPozxshjr1WndyvGAGg0TAeuhZHvqW3cp sC4VZbeFwERCd6/L5/kiRP2yWWafoXIOFdfOB0E8S5TZ32bBThnv2DlathMQGr9mQ3Mv LisrDRvT5i0hOsmiSl73mvydW0AxeDxxaPrzAosJFDIq8p2ax35of9fCU8n1Z9s5liA0 YkmwynkGpyUHSbzsKc+h0JR/wucE5hLFlVb28uIht4QF29E0Gbg7S75GC7ZJDjxUTlMf x+PQ6v73cVkBoFJRM4Zg+loTVeZIwUpDoBwxckEFVS9iBhDNW49+16lqEpis/yTy5Jhx tmPg== X-Forwarded-Encrypted: i=2; AJvYcCUf2YQZ2m+x7qtRX2CqBoUhibJj3N+kXoqiJtXv8mRFMM3FZoXsGXJ7Q2K7P+txjHYoBpIMp2yVlummXMCGQeLvmE6RL8vDeOJ6O6/1OGHWlc3Jiupytrw2QdIbZg== X-Gm-Message-State: AOJu0YzfUwbXt9/ySxSlmVYUGKirrDBZGadV5MvVSOX/IpeT++IT8cp6 /fWCBppg13Cr+zCe49DP+aR1BCC2QpulhR2AYeGuXDUGv7XvnM97Zt0k9xWnd8DWYWV/tW2mRw= = X-Google-Smtp-Source: AGHT+IGSJybtWUmJt9/IljOnCHAZJSaIWhtkhLKuIuuBH8FCEyMfQ+e4ceVv4W6ra9XyOe9Kjw1FeA== X-Received: by 2002:a50:8a84:0:b0:574:ea9d:51f8 with SMTP id 4fb4d7f45d1cf-578329fe2c7mr1010910a12.18.1716361373723; Wed, 22 May 2024 00:02:53 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:e9d:b0:578:25bd:e528 with SMTP id 4fb4d7f45d1cf-57825bde7b9ls329150a12.1.-pod-prod-08-eu; Wed, 22 May 2024 00:02:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW/0dvOedmNyzqIrKyfzJIYODKWvjHNVXXfmQDadeepB83bJSYxukqDLMt5HCjJUMYyVRMcQJ8ubhBxjyNELSu8chmBpcLwbbU820kzJxeXHaef X-Received: by 2002:a50:8d4e:0:b0:572:4e6b:958 with SMTP id 4fb4d7f45d1cf-578329c8c82mr1014124a12.2.1716361372223; Wed, 22 May 2024 00:02:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361372; cv=none; d=google.com; s=arc-20160816; b=tDCHXLKT3qMAz9rwWIlDBvimz0dO8fxanA2g5DMDS07kX2aB3a6eD/oiFKVDuInXWr m1g2kY8xZXVCn7nkUFuAxSeWFzbGITZrQN0UQl8l3uR5HymTAeyAn65UDhcn9rlVblId 0rJxAywGfWW6WVG276A+B/MAgVQknUIdXVK2WQEHDAS9ZZtsDCh9FyhQ593vzCpAxq7/ IWu7eRp2E+UFdv/W0aNTjnMidabBdp4rJ2MOCQBtJXMOaa6wHydMeLXA/ECuchM5HJFx WyqAInugYq0mupfSgRESMJSdnSuDGMXeZRq49/hnj42HtZuvHSW9AgsKr/QTYUm9mCbb L20Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=F3jUMTjQuVY3DEmL6gNZCYhAlpLJFtfL9KDS9J+O1pc=; fh=qMFfo3i6SRlY8oTZU/OgeNbv84NZDX/6itr0Zshw9tg=; b=dQpiMKh9ydp0WytI08X4TgWLV3qy5Avh3vT15G7zETMsACXFPOMamXUZEkPvBkJk93 D5eAK6t3bbotH5bKWCrDIZLxup5+PUFJZ4BSYljOaQR+pcSQIKvXlQqNGe0IpAenqY4Q OpZHXUW//unZSxwbBFO4THCzG4VMlDL5FS8fA7jjgydznVUfYdQiQoo885c1HVnB7vqm QBN5wCNBgHijvobyXPLxN6me0NFxaF5Bsa92ftCKTdmEYJdtIerguxzkRT1+4ATRsDAA smxb8NhRnsCq2/3tAdTKCSNkhi/mFQlESINg7nkGQSiKKWxbluGgbC9qkn77Z5QvPG2a efww==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=H7HKdZeB; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 4fb4d7f45d1cf-574f6bd0433sor3936392a12.2.2024.05.22.00.02.52 for (Google Transport Security); Wed, 22 May 2024 00:02:52 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCVvknSTB0tut7msIWZb2nIN7vysoMyG5WDsYgxyAfLWlblNqnB8IXSd5Ryb3hktDylJwXP8mPTK2cDSD0wLesf4X4+T2LGTfeV/PRyMW+W4QkHJ X-Received: by 2002:a50:9e25:0:b0:572:a731:dd1d with SMTP id 4fb4d7f45d1cf-57832a3e7f0mr1000753a12.25.1716361371881; Wed, 22 May 2024 00:02:51 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.196]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574d738c80csm12028365a12.81.2024.05.22.00.02.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:02:51 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Jagan Teki , Romain Naour , Fabrice Fontaine , Mahyar Koshkouei , Giulio Benetti , Michael Nosthoff , Alex Suykov , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= , Bernd Kuhls , Peter Korsgaard , Julien Corjon , Sergey Matyukevich , linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2 05/18] package/bzip2: update the patches to be applied with fuzz 0 Date: Wed, 22 May 2024 09:02:24 +0200 Message-ID: <20240522070238.3282121-6-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> References: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=H7HKdZeB; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi --- package/bzip2/0001-build-objects-twice.patch | 14 ++++++++------ package/bzip2/0002-improve-build-system.patch | 12 +++++++----- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/package/bzip2/0001-build-objects-twice.patch b/package/bzip2/0001-build-objects-twice.patch index 9bde0f6488c0..52b234f65a8e 100644 --- a/package/bzip2/0001-build-objects-twice.patch +++ b/package/bzip2/0001-build-objects-twice.patch @@ -8,14 +8,16 @@ and build the shared objects as *.sho instead of *.o. Then, we use these objects to create the shared library. Signed-off-by: Markos Chandras +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi Index: bzip2-1.0.6/Makefile-libbz2_so =================================================================== --- bzip2-1.0.6.orig/Makefile-libbz2_so +++ bzip2-1.0.6/Makefile-libbz2_so -@@ -25,13 +25,13 @@ SHELL=/bin/sh - CC=gcc - override CFLAGS += -fpic -fPIC -Wall +@@ -26,13 +26,13 @@ CC=gcc + BIGFILES=-D_FILE_OFFSET_BITS=64 + CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) -OBJS= blocksort.o \ - huffman.o \ @@ -33,10 +35,10 @@ Index: bzip2-1.0.6/Makefile-libbz2_so + bzlib.sho all: $(OBJS) - $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) -@@ -45,17 +45,5 @@ install: + $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS) +@@ -43,17 +43,5 @@ all: $(OBJS) clean: - rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared + rm -f $(OBJS) bzip2.o libbz2.so.1.0.8 libbz2.so.1.0 bzip2-shared -blocksort.o: blocksort.c - $(CC) $(CFLAGS) -c blocksort.c diff --git a/package/bzip2/0002-improve-build-system.patch b/package/bzip2/0002-improve-build-system.patch index 2d6e2cf900d2..11a856e49c96 100644 --- a/package/bzip2/0002-improve-build-system.patch +++ b/package/bzip2/0002-improve-build-system.patch @@ -20,12 +20,14 @@ This patch makes a number of improvements to the bzip2 build system: appropriate symbolic links. Signed-off-by: Thomas Petazzoni +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi Index: b/Makefile =================================================================== --- a/Makefile +++ b/Makefile -@@ -20,8 +20,7 @@ +@@ -20,8 +20,7 @@ AR=ar RANLIB=ranlib LDFLAGS= @@ -35,7 +37,7 @@ Index: b/Makefile # Where you want it installed when you do 'make install' PREFIX=/usr/local -@@ -90,14 +89,14 @@ +@@ -90,14 +89,14 @@ install: bzip2 bzip2recover cp -f libbz2.a $(PREFIX)/lib chmod a+r $(PREFIX)/lib/libbz2.a cp -f bzgrep $(PREFIX)/bin/bzgrep @@ -66,9 +68,9 @@ Index: b/Makefile-libbz2_so -CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) +override CFLAGS += -fpic -fPIC -Wall - OBJS= blocksort.o \ - huffman.o \ -@@ -37,8 +36,11 @@ + OBJS= blocksort.sho \ + huffman.sho \ +@@ -37,8 +36,11 @@ OBJS= blocksort.sho \ all: $(OBJS) $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS) $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8