From: "Peter Müller" <peter.mueller@link38.eu>
To: development@lists.ipfire.org
Subject: Re: [PATCH] pciutils: update to 3.5.6
Date: Wed, 08 Aug 2018 18:18:03 +0200 [thread overview]
Message-ID: <0f133420-b5c8-9132-8bc7-5d90aef4b4e7@link38.eu> (raw)
In-Reply-To: <8fa43c905c407e9e5ecda35710aae911ed814c77.camel@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 2393 bytes --]
Hello Michael,
> Hey,
>
> this patch won't apply for some reason:
>
> [root(a)hughes ipfire-2.x]# pwclient git-am -s 1874
> Applying patch #1874 using 'git am -s'
> Description: Postfix: update to 3.3.1
> Patch is empty.
> 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".
> 'git am' failed with exit status 128
> [root(a)hughes ipfire-2.x]# git am --abort
>
> Downloading the mbox file and applying it with patch does work though.
> Any idea what could have changed here?
I have absolutely no idea and did not change my patch submitting procedure.
At least I am unaware of it.
Do you know if PGP/MIME is a problem for the software? This is the only
thing I can imagine, but it was not changed, either.
Best regards,
Peter Müller
>
> Best,
> -Michael
>
> On Tue, 2018-08-07 at 21:07 +0200, Peter Müller wrote:
>> Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
>> ---
>> config/rootfiles/common/pciutils | 2 +-
>> lfs/pciutils | 6 +++---
>> 2 files changed, 4 insertions(+), 4 deletions(-)
>
>> diff --git a/config/rootfiles/common/pciutils b/config/rootfiles/common/pciutils
>> index 5bb11a259..da35ef6a1 100644
>> --- a/config/rootfiles/common/pciutils
>> +++ b/config/rootfiles/common/pciutils
>> @@ -1,7 +1,7 @@
>> bin/lspci
>> bin/setpci
>> lib/libpci.so.3
>> -lib/libpci.so.3.4.1
>> +lib/libpci.so.3.5.6
>> sbin/update-pciids
>> #usr/include/pci
>> #usr/include/pci/config.h
>> diff --git a/lfs/pciutils b/lfs/pciutils
>> index 7c313ba3e..1ebfef0c8 100644
>> --- a/lfs/pciutils
>> +++ b/lfs/pciutils
>> @@ -24,10 +24,10 @@
>
>> include Config
>
>> -VER = 3.4.1
>> +VER = 3.5.6
>
>> THISAPP = pciutils-$(VER)
>> -DL_FILE = $(THISAPP).tar.xz
>> +DL_FILE = $(THISAPP).tar.gz
>> DL_FROM = $(URL_IPFIRE)
>> DIR_APP = $(DIR_SRC)/$(THISAPP)
>> TARGET = $(DIR_INFO)/$(THISAPP)
>> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>
>> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>
>> -$(DL_FILE)_MD5 = 35763bb1eab7bc9bf6eb6efb72cbc8a1
>> +$(DL_FILE)_MD5 = 63b347d2bb5719b7769c03a1bb72a5b7
>
>> install : $(TARGET)
>
>
--
"We don't care. We don't have to. We're the Phone Company."
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
prev parent reply other threads:[~2018-08-08 16:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-07 19:07 Peter Müller
2018-08-08 7:40 ` Michael Tremer
2018-08-08 16:18 ` Peter Müller [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0f133420-b5c8-9132-8bc7-5d90aef4b4e7@link38.eu \
--to=peter.mueller@link38.eu \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox