[OpenWrt-Devel] (no subject)

[Yousong Zhou]

On 14 June 2016 at 06:04, Jerome <jeromepoulin at gmail.com> wrote:
> To: openwrt-devel at lists.openwrt.org
> From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Poulin?= <jeromepoulin at gmail.com>
> Date: Mon, 13 Jun 2016 17:47:50 -0400
> Subject: [PATCH] micropython-lib: fix make install seldom fail
>
> - Since make install path was hardcoded inside the build dir, it can sometime
>   fail with cp indicating that source and destination are the same since make
>   install will copy all py file in build dir to install dir. In this case,
>   install dir is in build dir causing a loop.
> ---
>  lang/micropython-lib/Makefile | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>

Hi, Jerome

micropython-lib is maintained in packages feed hosted in github.
Please open a pr there with a signed-off-by line in the commit message
body [2].

 [1] https://github.com/openwrt/packages
 [2] https://github.com/openwrt/packages/blob/master/CONTRIBUTING.md#commits-in-your-pull-requests-should

Cheers,
                yousong

> diff --git a/lang/micropython-lib/Makefile b/lang/micropython-lib/Makefile
> index b8af737..aefb8f4 100644
> --- a/lang/micropython-lib/Makefile
> +++ b/lang/micropython-lib/Makefile
> @@ -22,6 +22,7 @@ PKG_SOURCE_VERSION:=bfbbf85a181d84e2494ea6f15be311734666bf67
>  PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION)
>  PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
> +PKG_INSTALL_DIR:=$(BUILD_DIR)/_install_tmp
>  PKG_BUILD_PARALLEL:=1
>
>  include $(INCLUDE_DIR)/package.mk
> @@ -43,12 +44,12 @@ endef
>
>  MAKE_FLAGS:=\
>         -C $(PKG_BUILD_DIR) \
> -       PREFIX=$(PKG_BUILD_DIR)/_install_tmp \
> +       PREFIX=$(PKG_INSTALL_DIR) \
>         install
>
>  define Package/micropython-lib/install
>         $(INSTALL_DIR) $(1)/usr/lib/micropython
> -       $(CP) $(PKG_BUILD_DIR)/_install_tmp/* $(1)/usr/lib/micropython
> +       $(CP) $(PKG_INSTALL_DIR)/* $(1)/usr/lib/micropython
>  endef
>
>  $(eval $(call BuildPackage,micropython-lib))
> --
> 2.7.4
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel at lists.openwrt.org
> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel