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

Eneas U de Queiroz cotequeiroz at gmail.com
Sat Mar 27 00:35:39 GMT 2021


On Fri, Mar 26, 2021 at 6:57 PM Felix Fietkau <nbd at nbd.name> wrote:
> I fully agree with Eneas here (though I don't like his patch for this
> issue either).

This is the first time I wrote a patch I do NOT want to be applied.  I
just want to keep the status quo.

> Here's a way to fix this:
>
> include/package-defaults.mk has this:
>
>   define Build/Prepare/Default
>         $(PKG_UNPACK)
>         [ ! -d ./src/ ] || $(CP) ./src/. $(PKG_BUILD_DIR)
>         $(Build/Patch)
>   endef

However, this is run before the patches are even applied when QUILT=1.
$(Build/Patch) just builds the quilt patch tree.  A much simpler
solution, if we are really going to change the patches, is to just
$(CP) the file in Build/Configure.  If we move it--no matter
where--then we can't go back and forth with quilt push & pop, which
would hinder its usefulness.

>
> You can adjust it to define this in the package Makefile:
>
> define Build/Prepare
>         $(PKG_UNPACK)
>         [ ! -d ./src/ ] || $(CP) ./src/. $(PKG_BUILD_DIR)
>         mv $(PKG_BUILD_DIR)/crypto/engine/eng_devcrypto.c $(PKG_BUILD_DIR)/engines/e_devcrypto.c
>         $(Build/Patch)
> endef
>
> - Felix



More information about the openwrt-devel mailing list