[PATCH] openssl: don't rename a file with quilt

[Rosen Penev]

On Fri, Mar 26, 2021 at 5:55 AM Eneas U de Queiroz
<cotequeiroz at gmail.com> wrote:
>
> Hi Rosen
>
> This patch does not apply as is, but don't write a v2 yet.
> I'm testing the bump to 1.1.1k, and I'll handle it from there, by
> using --no-renames with git format-patch.  I'm maintaining the patches
> at https://github.com/cotequeiroz/openssl, and refreshing backports
> with git is much easier than with quilt.  See comments below, as your
> patchset breaks compilation with QUILT.
>
> On Fri, Mar 26, 2021 at 6:26 AM Rosen Penev <rosenp at gmail.com> wrote:
> >
> > quilt cannot handle file renames and ends up duplicating the file.
> > Instead of doing that, handle the renaming in the Makefile so that
> > the upstream file can change.
> >
> > Signed-off-by: Rosen Penev <rosenp at gmail.com>
> > ---
> >  package/libs/openssl/Makefile                 |    7 +
> >  ...o-make-the-dev-crypto-engine-dynamic.patch | 2633 +----------------
> >  ...default-to-not-use-digests-in-engine.patch |    4 +-
> >  ...to-ignore-error-when-closing-session.patch |    4 +-
> >  4 files changed, 151 insertions(+), 2497 deletions(-)
> >
> > diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile
> > index 436abfd94c..f3113cab6e 100644
> > --- a/package/libs/openssl/Makefile
> > +++ b/package/libs/openssl/Makefile
> > @@ -324,6 +324,13 @@ OPENSSL_TARGET:=linux-$(call qstrip,$(CONFIG_ARCH))-openwrt
> >
> >  STAMP_CONFIGURED := $(STAMP_CONFIGURED)_$(shell echo $(OPENSSL_OPTIONS) | mkhash md5)
> >
> > +define Build/Prepare
> > +       $(call Build/Prepare/Default)
>
>
> > +ifeq ($(QUILT),)
> > +       mv $(PKG_BUILD_DIR)/crypto/engine/eng_devcrypto.c $(PKG_BUILD_DIR)/engines/e_devcrypto.c
> > +endif
>
> This will break compilation with QUILT, as the rename will never
> happen then.  You're using this strategy with other packages, so I
> won't mention them individually, but this applies to all.
> I would handle it at the patch level by removing the old file and
> creating the new one.
It doesn't break quilt as the rename happens separately. Note that the
patches were modified to refer to the old name.
>
> Alternatively, you can keep your strategy, adding the rename with
> QUILT in Build/Configure, with the caveat that it will run every time
> compile is called, so you'll need to ignore an eventual error, and
> make sure that the original file was not recreated somewhere in the
> build process by a previous compile run, which would clobber the
> patched file.
I haven't seen any issues. Locally I run make package/x/{clean,refresh}
>
> Cheers