From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] readline: add forgotten patches 1-3
Date: Wed, 07 Jun 2017 10:04:38 +0100 [thread overview]
Message-ID: <1496826278.4077.12.camel@ipfire.org> (raw)
In-Reply-To: <20170606084139.23692-1-marcel.lorenz@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 2476 bytes --]
If things like this happen, please re-send the entire patch and not a fix to the
patch.
Again, this makes it hard to track changes.
-Michael
On Tue, 2017-06-06 at 10:41 +0200, Marcel Lorenz wrote:
> Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
> ---
> lfs/readline | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/lfs/readline b/lfs/readline
> index 5f88228..dcacb6d 100644
> --- a/lfs/readline
> +++ b/lfs/readline
> @@ -1,7 +1,7 @@
> #############################################################################
> ##
> #
> #
> # IPFire.org - A linux based
> firewall #
> -# Copyright (C) 2016 IPFire Team <info(a)ipfire.org>
> #
> +# Copyright (C) 2017 IPFire Team <info(a)ipfire.org>
> #
> #
> #
> # This program is free software: you can redistribute it and/or
> modify #
> # it under the terms of the GNU General Public License as published
> by #
> @@ -31,8 +31,6 @@ DL_FILE = $(THISAPP).tar.gz
> DL_FROM = $(URL_IPFIRE)
> DIR_APP = $(DIR_SRC)/$(THISAPP)
> TARGET = $(DIR_INFO)/$(THISAPP)
> -PROG = readline
> -PAK_VER = 1
>
> #############################################################################
> ##
> # Top-level Rules
> @@ -76,9 +74,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> @$(PREBUILD)
> @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
>
> - #for i in $$(seq 1 6); do \
> - # cd $(DIR_APP) && patch -Np0 <
> $(DIR_SRC)/src/patches/readline/readline63-$$(printf "%03d" "$${i}") || exit
> 1; \
> - #done
> + for i in $$(seq 1 3); do \
> + cd $(DIR_APP) && patch -Np0 <
> $(DIR_SRC)/src/patches/readline/readline70-$$(printf "%03d" "$${i}") || exit
> 1; \
> + done
>
> # prevent in some cases to trigger a linking bug in ldconfig
> cd $(DIR_APP) &&sed -i '/MV.*old/d' Makefile.in
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
prev parent reply other threads:[~2017-06-07 9:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-06 8:41 Marcel Lorenz
2017-06-07 9:04 ` Michael Tremer [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=1496826278.4077.12.camel@ipfire.org \
--to=michael.tremer@ipfire.org \
--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