* [Buildroot] [PATCH v3 1/2] cracklib: New package
From: Thomas Petazzoni @ 2017-05-04 21:19 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170419075602.22245-1-stefan.sorensen@spectralink.com>
Hello,
On Wed, 19 Apr 2017 09:56:01 +0200, Stefan S?rensen wrote:
> Changes since v2:
> * Add two upstream bugfixes
> * Add patch to force grep to treat the words file as text
> * Add $(HOST_MAKE_ENV) when build the dict
>
> Changes since v1:
> * Update DEVELOPERS file
> * Use SPDX license codes
> * Use the tools from host-cracklib for generating dictionary files
>
> Signed-off-by: Stefan S?rensen <stefan.sorensen@spectralink.com>
> ---
> DEVELOPERS | 1 +
> package/Config.in | 1 +
> .../0001-Apply-patch-to-fix-CVE-2016-6318.patch | 114 +++++++++++++++++++++
> ...x-a-buffer-overflow-processing-long-words.patch | 49 +++++++++
> ...to-treat-the-input-as-text-when-formattin.patch | 30 ++++++
> package/cracklib/Config.in | 28 +++++
> package/cracklib/cracklib.hash | 3 +
> package/cracklib/cracklib.mk | 36 +++++++
> 8 files changed, 262 insertions(+)
> create mode 100644 package/cracklib/0001-Apply-patch-to-fix-CVE-2016-6318.patch
> create mode 100644 package/cracklib/0002-Fix-a-buffer-overflow-processing-long-words.patch
> create mode 100644 package/cracklib/0003-Force-grep-to-treat-the-input-as-text-when-formattin.patch
> create mode 100644 package/cracklib/Config.in
> create mode 100644 package/cracklib/cracklib.hash
> create mode 100644 package/cracklib/cracklib.mk
You received quite a bit of feedback from Danomi and Romain. Could you
take it into account and send an updated version?
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 2/2] package/nvidia-driver: add glesv2.pc
From: Thomas Petazzoni @ 2017-05-04 21:17 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170419123214.18835-2-bernd.kuhls@t-online.de>
Hello,
On Wed, 19 Apr 2017 14:32:14 +0200, Bernd Kuhls wrote:
> +Libs: -L${libdir} -lGLESv1_CM
This looks wrong for glesv2.pc, it should point go the OpenGL ES v2
library.
Perhaps you want to do like the nvidia-tegra package, with gles.pc and
glesv2.pc.
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 1/2] package/nvidia-driver: bump version to 381.09
From: Thomas Petazzoni @ 2017-05-04 21:16 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170419123214.18835-1-bernd.kuhls@t-online.de>
Hello,
On Wed, 19 Apr 2017 14:32:13 +0200, Bernd Kuhls wrote:
> libnvidia-egl-wayland.so was renamed in upstream archive.
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/nvidia-driver/nvidia-driver.hash | 4 ++--
> package/nvidia-driver/nvidia-driver.mk | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [git commit] package/nvidia-driver: bump version to 381.09
From: Thomas Petazzoni @ 2017-05-04 21:14 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=47ef5def00f5d991dafe53a6eb6566147124444e
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
libnvidia-egl-wayland.so was renamed in upstream archive.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/nvidia-driver/nvidia-driver.hash | 4 ++--
package/nvidia-driver/nvidia-driver.mk | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package/nvidia-driver/nvidia-driver.hash b/package/nvidia-driver/nvidia-driver.hash
index 04a44b8..7fa729e 100644
--- a/package/nvidia-driver/nvidia-driver.hash
+++ b/package/nvidia-driver/nvidia-driver.hash
@@ -1,3 +1,3 @@
# Locally computed
-sha256 cc79d3ac2b688009ed2e47a1cf27557aea5dd745b3b6e9b83945c359ddab4335 NVIDIA-Linux-x86-375.20.run
-sha256 d10e40a19dc57ac958567a2b247c2b113e5f1e4186ad48e9a58e70a46d07620b NVIDIA-Linux-x86_64-375.20.run
+sha256 c39805e6610f710d16acf57c9d09cb5504d33c557e634e632079d46f18da4268 NVIDIA-Linux-x86-381.09.run
+sha256 04ec99f6d621adc464314adc82a92009e071a301a773487df7f460333e04e98c NVIDIA-Linux-x86_64-381.09.run
diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk
index 6ed7d52..d8dedd9 100644
--- a/package/nvidia-driver/nvidia-driver.mk
+++ b/package/nvidia-driver/nvidia-driver.mk
@@ -4,7 +4,7 @@
#
################################################################################
-NVIDIA_DRIVER_VERSION = 375.20
+NVIDIA_DRIVER_VERSION = 381.09
NVIDIA_DRIVER_SUFFIX = $(if $(BR2_x86_64),_64)
NVIDIA_DRIVER_SITE = http://download.nvidia.com/XFree86/Linux-x86$(NVIDIA_DRIVER_SUFFIX)/$(NVIDIA_DRIVER_VERSION)
NVIDIA_DRIVER_SOURCE = NVIDIA-Linux-x86$(NVIDIA_DRIVER_SUFFIX)-$(NVIDIA_DRIVER_VERSION).run
@@ -58,7 +58,7 @@ NVIDIA_DRIVER_LIBS_GLES = \
NVIDIA_DRIVER_LIBS_MISC = \
libnvidia-eglcore.so.$(NVIDIA_DRIVER_VERSION) \
- libnvidia-egl-wayland.so.$(NVIDIA_DRIVER_VERSION) \
+ libnvidia-egl-wayland.so.1.0.1 \
libnvidia-glcore.so.$(NVIDIA_DRIVER_VERSION) \
libnvidia-glsi.so.$(NVIDIA_DRIVER_VERSION) \
tls/libnvidia-tls.so.$(NVIDIA_DRIVER_VERSION) \
^ permalink raw reply related
* [Buildroot] [PATCH 1/2] package/nvidia-driver: bump version to 381.09
From: Thomas Petazzoni @ 2017-05-04 21:14 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170504230933.1a80f407@free-electrons.com>
Hello,
On Thu, 4 May 2017 23:09:33 +0200, Thomas Petazzoni wrote:
> Bernd, unfortunately, I can't download it from here:
>
> thomas at skate:~/projets/buildroot (master)$ make nvidia-driver-extract
> >>> nvidia-driver 381.09 Downloading
> --2017-05-04 22:55:07-- ftp://download.nvidia.com/XFree86/Linux-x86/381.09/NVIDIA-Linux-x86-381.09.run
Figured it out: using http:// instead of ftp:// fixes the issue. The
NVidia website points to http:// for downloading the drivers.
Fixed in
https://git.buildroot.org/buildroot/commit/?id=2068c7c6a810cdaf55240faf15c226ce3b308f1b
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [git commit] nvidia-driver: use http:// instead of ftp://
From: Thomas Petazzoni @ 2017-05-04 21:13 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=2068c7c6a810cdaf55240faf15c226ce3b308f1b
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Fixes the download, which currently times out on http://.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/nvidia-driver/nvidia-driver.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk
index 0d03110..6ed7d52 100644
--- a/package/nvidia-driver/nvidia-driver.mk
+++ b/package/nvidia-driver/nvidia-driver.mk
@@ -6,7 +6,7 @@
NVIDIA_DRIVER_VERSION = 375.20
NVIDIA_DRIVER_SUFFIX = $(if $(BR2_x86_64),_64)
-NVIDIA_DRIVER_SITE = ftp://download.nvidia.com/XFree86/Linux-x86$(NVIDIA_DRIVER_SUFFIX)/$(NVIDIA_DRIVER_VERSION)
+NVIDIA_DRIVER_SITE = http://download.nvidia.com/XFree86/Linux-x86$(NVIDIA_DRIVER_SUFFIX)/$(NVIDIA_DRIVER_VERSION)
NVIDIA_DRIVER_SOURCE = NVIDIA-Linux-x86$(NVIDIA_DRIVER_SUFFIX)-$(NVIDIA_DRIVER_VERSION).run
NVIDIA_DRIVER_LICENSE = NVIDIA Software License
NVIDIA_DRIVER_LICENSE_FILES = LICENSE
^ permalink raw reply related
* [Buildroot] [PATCH 1/2] package/nvidia-driver: bump version to 381.09
From: Thomas Petazzoni @ 2017-05-04 21:09 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170419123214.18835-1-bernd.kuhls@t-online.de>
Hello,
On Wed, 19 Apr 2017 14:32:13 +0200, Bernd Kuhls wrote:
> libnvidia-egl-wayland.so was renamed in upstream archive.
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Yann, could you comment on this patch?
Bernd, unfortunately, I can't download it from here:
thomas at skate:~/projets/buildroot (master)$ make nvidia-driver-extract
>>> nvidia-driver 381.09 Downloading
--2017-05-04 22:55:07-- ftp://download.nvidia.com/XFree86/Linux-x86/381.09/NVIDIA-Linux-x86-381.09.run
=> ?/home/thomas/projets/buildroot/output/build/.NVIDIA-Linux-x86-381.09.run.ZpEVbh/output?
Resolving download.nvidia.com (download.nvidia.com)... 192.229.220.191
Connecting to download.nvidia.com (download.nvidia.com)|192.229.220.191|:21... failed: Connection timed out.
Retrying.
--2017-05-04 22:57:15-- ftp://download.nvidia.com/XFree86/Linux-x86/381.09/NVIDIA-Linux-x86-381.09.run
(try: 2) => ?/home/thomas/projets/buildroot/output/build/.NVIDIA-Linux-x86-381.09.run.ZpEVbh/output?
Connecting to download.nvidia.com (download.nvidia.com)|192.229.220.191|:21... failed: Connection timed out.
Retrying.
--2017-05-04 22:59:25-- ftp://download.nvidia.com/XFree86/Linux-x86/381.09/NVIDIA-Linux-x86-381.09.run
(try: 3) => ?/home/thomas/projets/buildroot/output/build/.NVIDIA-Linux-x86-381.09.run.ZpEVbh/output?
Connecting to download.nvidia.com (download.nvidia.com)|192.229.220.191|:21... failed: Connection timed out.
Giving up.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [git commit] lua-resty-http: new package
From: Peter Korsgaard @ 2017-05-04 21:02 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170504202355.59D7A826D5@busybox.osuosl.org>
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
> commit: https://git.buildroot.net/buildroot/commit/?id=e88995f065986dc56ce5a7c222f7a9f6cbff2b94
> branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
> Signed-off-by: Semyon Kolganov <semenak94@mail.ru>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
> DEVELOPERS | 1 +
> package/Config.in | 1 +
> package/lua-resty-http/Config.in | 6 ++++++
> package/lua-resty-http/lua-resty-http.hash | 2 ++
> package/lua-resty-http/lua-resty-http.mk | 12 ++++++++++++
> 5 files changed, 22 insertions(+)
> +++ b/package/lua-resty-http/Config.in
> @@ -0,0 +1,6 @@
> +config BR2_PACKAGE_LUA_RESTY_HTTP
> + bool "lua-resty-http"
> + help
> + Lua HTTP client cosocket driver for OpenResty / ngx_lua.
> +
> + http://github.com/pintsized/lua-resty-http
Sorry for the slow response, but this patch apparently never made it to
my mailbox? (It is in the archive, so it must have been an issue on my
side).
I'm far from an expert in nginx, but isn't this an extension to the
lua-nginx-module that we don't (explicitly) have in Buildroot? Is it in
any way useful without it?
What is your use case for it?
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH] uclibc: arc: Disable usage of atomic ops if hardware has no LLSC
From: Thomas Petazzoni @ 2017-05-04 20:54 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170419174857.23185-1-abrodkin@synopsys.com>
Hello,
On Wed, 19 Apr 2017 20:48:57 +0300, Alexey Brodkin wrote:
> +ifneq ($(BR2_ARC_ATOMIC_EXT),y)
Changed to:
ifeq ($(BR2_ARC_ATOMIC_EXT),)
and applied. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [git commit] uclibc: arc: Disable usage of atomic ops if hardware has no LLSC
From: Thomas Petazzoni @ 2017-05-04 20:51 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=64c67e07fa40e1af1a9dbba907a0117765b16c16
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Since uClibc-ng v1.0.20 we can force libc to either use llock/scond
instructions for atomic ops or if those are missing use kernel-assisted
emulation. By default atomics are used so we disable that feature in
libc if we build for a target without LLSC.
This allows us to build and use NPTL on ARC750 for example which was not
possible before.
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/uclibc/uclibc.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index f47b3ec..bbf389e 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -101,6 +101,12 @@ define UCLIBC_ARC_PAGE_SIZE_CONFIG
$(call KCONFIG_ENABLE_OPT,$(UCLIBC_ARC_PAGE_SIZE),$(@D)/.config)
endef
+ifeq ($(BR2_ARC_ATOMIC_EXT),)
+define UCLIBC_ARC_ATOMICS_CONFIG
+ $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_HAS_ATOMICS,$(@D)/.config)
+endef
+endif
+
endif # arc
#
@@ -395,6 +401,7 @@ define UCLIBC_KCONFIG_FIXUP_CMDS
$(UCLIBC_BINFMT_CONFIG)
$(UCLIBC_ARC_TYPE_CONFIG)
$(UCLIBC_ARC_PAGE_SIZE_CONFIG)
+ $(UCLIBC_ARC_ATOMICS_CONFIG)
$(UCLIBC_ARM_ABI_CONFIG)
$(UCLIBC_ARM_BINFMT_FLAT)
$(UCLIBC_ARM_NO_CONTEXT_FUNCS)
^ permalink raw reply related
* [Buildroot] [PATCH 1/1] spidev_test: Build latest version if possible
From: Thomas Petazzoni @ 2017-05-04 20:45 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170419133044.23558-1-joeri.barbarien@gmail.com>
Hello,
On Wed, 19 Apr 2017 15:30:44 +0200, Joeri Barbarien wrote:
> From: Joeri Barbarien <joeri.barbarien@nokia.com>
>
> spidev_test has further evolved after kernel version 3.15, which
> is the most recent version that could be built in this package.
> This change allows to build the latest version of spidev_test if
> the toolchain's kernel header version allows it. In this way, when
> building with a newer toolchain, we are able to benefit from the
> added functionality offered by the newest version of the tool.
>
> Signed-off-by: Joeri Barbarien <joeri.barbarien@nokia.com>
> ---
> package/spidev_test/spidev_test.hash | 2 +-
> package/spidev_test/spidev_test.mk | 10 ++++++++--
> 2 files changed, 9 insertions(+), 3 deletions(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [git commit] spidev_test: bump to version in Linux 4.10
From: Thomas Petazzoni @ 2017-05-04 20:44 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=a497a9fd6cdb518572282b1478279f476f870fb7
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
spidev_test has further evolved after kernel version 3.15, which
is the most recent version that could be built in this package.
This change allows to build the latest version of spidev_test if
the toolchain's kernel header version allows it. In this way, when
building with a newer toolchain, we are able to benefit from the
added functionality offered by the newest version of the tool.
Signed-off-by: Joeri Barbarien <joeri.barbarien@nokia.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/spidev_test/spidev_test.hash | 2 +-
package/spidev_test/spidev_test.mk | 10 ++++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/package/spidev_test/spidev_test.hash b/package/spidev_test/spidev_test.hash
index 6871288..7bc4a27 100644
--- a/package/spidev_test/spidev_test.hash
+++ b/package/spidev_test/spidev_test.hash
@@ -1,3 +1,3 @@
# Locally calculated
sha256 80471c330d8c0bf5ba6479c434a54a54bdd2dc59a703b9c76c2541ec04cfb8c3 spidev_test.c?id=v3.0
-sha256 57fa6c534e0b7b4d234075e18bc89e2f3c9fc4ecc27e80f349a8057708e0de46 spidev_test.c?id=v3.15
+sha256 3cf76b15d9a8644f3f5cbc0387cc02a7d4a392ade39788cbc6367cce98552e2f spidev_test.c?id=v4.10
diff --git a/package/spidev_test/spidev_test.mk b/package/spidev_test/spidev_test.mk
index 50e7a30..1f34c6a 100644
--- a/package/spidev_test/spidev_test.mk
+++ b/package/spidev_test/spidev_test.mk
@@ -4,15 +4,21 @@
#
################################################################################
+# Build the latest version that is compatible with the toolchain's kernel headers
# v3.15+ requires SPI_TX_QUAD/SPI_RX_QUAD to build
# Normally kernel headers can't be newer than kernel so switch based on that.
# If you need quad-pumped spi support you need to upgrade your toolchain.
+# Note that the location of spidev_test.c changes from v4.5 onwards.
+
ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15),y)
-SPIDEV_TEST_VERSION = v3.15
+SPIDEV_TEST_VERSION = v4.10
+SPIDEV_TEST_PATH = tools/spi
else
SPIDEV_TEST_VERSION = v3.0
+SPIDEV_TEST_PATH = Documentation/spi
endif
-SPIDEV_TEST_SITE = http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/plain/Documentation/spi
+
+SPIDEV_TEST_SITE = http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/plain/$(SPIDEV_TEST_PATH)
SPIDEV_TEST_SOURCE = spidev_test.c?id=$(SPIDEV_TEST_VERSION)
SPIDEV_TEST_LICENSE = GPL-2.0
^ permalink raw reply related
* [Buildroot] [PATCH] luvi: fix build
From: Thomas Petazzoni @ 2017-05-04 20:42 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170504202900.15617-1-francois.perrad@gadz.org>
Hello,
On Thu, 4 May 2017 22:29:00 +0200, Francois Perrad wrote:
> broken by LuaJIT 2.0.4 --> 2.0.5
> see http://autobuild.buildroot.net/results/3ee/3eef12dbe07fb375e87b2b2898dcc5ef0c11e7a5/build-end.log
>
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
> package/luvi/luvi.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [git commit] luvi: fix build with LuaJIT 2.0.5
From: Thomas Petazzoni @ 2017-05-04 20:39 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=63e1e113f27f54d417aca037fd0c7737288ccf83
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Luvi got broken by the bump of LuaJIT from 2.0.4 to 2.0.5 due to a
hardcoded path.
Fixes:
http://autobuild.buildroot.net/results/3eef12dbe07fb375e87b2b2898dcc5ef0c11e7a5/
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/luvi/luvi.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/luvi/luvi.mk b/package/luvi/luvi.mk
index ade63f5..3b2094c 100644
--- a/package/luvi/luvi.mk
+++ b/package/luvi/luvi.mk
@@ -33,7 +33,7 @@ LUVI_CONF_OPTS = \
-DBUILD_SHARED_LIBS=OFF \
-DWithSharedLibluv=ON \
-DTARGET_ARCH=$(LUVI_TARGET_ARCH) \
- -DLUA_PATH=$(HOST_DIR)/usr/share/luajit-2.0.4/?.lua
+ -DLUA_PATH=$(HOST_DIR)/usr/share/luajit-$(LUAJIT_VERSION)/?.lua
# Add "rex" module (PCRE via bundled lrexlib)
ifeq ($(BR2_PACKAGE_PCRE),y)
^ permalink raw reply related
* [Buildroot] [PATCH v9 0/7] e2fsprogs: refactor to fix conflicts with busybox and util-linux
From: Thomas Petazzoni @ 2017-05-04 20:37 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170422224919.3257-1-arnout@mind.be>
Hello,
On Sun, 23 Apr 2017 00:49:12 +0200, Arnout Vandecappelle
> Carlos Santos (7):
> e2fsprogs: refactor to fix conflicts with busybox and util-linux
> e2fsprogs: add help text for all config options
> e2fsprogs: disable unneeded features for host
> e2fsprogs: add explicit --enable/--disable configure options
> e2fsprogs: avoid conflict with util-linux fsck wrapper
> e2fsprogs: only add -lintl for static builds
> e2fsprogs: add empty lines to .mk file
Entire series applied. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [git commit] e2fsprogs: add empty lines to .mk file
From: Thomas Petazzoni @ 2017-05-04 20:33 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=854be948f8fa987876d6123381dd603e71360162
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
We usually have empty lines around multi-line variable definitions.
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/e2fsprogs/e2fsprogs.mk | 2 ++
1 file changed, 2 insertions(+)
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 70a1e4e..84af7ab 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -84,10 +84,12 @@ E2FSPROGS_CONF_ENV += LIBS=-lintl
endif
E2FSPROGS_MAKE_OPTS = LDCONFIG=true
+
E2FSPROGS_INSTALL_STAGING_OPTS = \
DESTDIR=$(STAGING_DIR) \
LDCONFIG=true \
install-libs
+
E2FSPROGS_INSTALL_TARGET_OPTS = \
DESTDIR=$(TARGET_DIR) \
LDCONFIG=true \
^ permalink raw reply related
* [Buildroot] [git commit] e2fsprogs: only add -lintl for static builds
From: Thomas Petazzoni @ 2017-05-04 20:33 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=0a269100ea1fb1e8f38c74174d801ad1204877fc
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
For dynamic library builds, it's not needed to pass it explicitly.
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/e2fsprogs/e2fsprogs.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index a60c69b..70a1e4e 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -77,7 +77,7 @@ HOST_E2FSPROGS_CONF_ENV += \
ac_cv_header_magic_h=no \
ac_cv_lib_magic_magic_file=no
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
+ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE)$(BR2_STATIC_LIBS),yy)
# util-linux libuuid pulls in libintl if needed, so ensure we also
# link against it, otherwise static linking fails
E2FSPROGS_CONF_ENV += LIBS=-lintl
^ permalink raw reply related
* [Buildroot] [git commit] e2fsprogs: avoid conflict with util-linux fsck wrapper
From: Thomas Petazzoni @ 2017-05-04 20:33 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=74cedf7eb91d5a2dfc94a3c1d4ec61bcacaeff6d
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
The fsck wrapper from util-linux is better maintained, so it should be
preferred. In particular, systemd relies on features in the util-linux
fsck wrapper that don't exist in the e2fsprogs one. However, since
e2fsprogs depends on util-linux, the one from e2fsprogs currently has
precedence. So in order to have e2fsck from e2fsprogs and the fsck
wrapper from util-linux, we disable e2fsprogs' fsck if the one from
util-linux is selected.
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
CC: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
[Arnout: don't add comment]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/e2fsprogs/Config.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in
index 23c4db5..b3d12b4 100644
--- a/package/e2fsprogs/Config.in
+++ b/package/e2fsprogs/Config.in
@@ -45,6 +45,7 @@ comment "e4defrag needs a glibc or musl toolchain"
config BR2_PACKAGE_E2FSPROGS_FSCK
bool "fsck"
default y
+ depends on !BR2_PACKAGE_UTIL_LINUX_FSCK
help
Check and repair a Linux file system. This is a wrapper around
the filesystem-specific fsck tools.
^ permalink raw reply related
* [Buildroot] [git commit] e2fsprogs: add explicit --enable/--disable configure options
From: Thomas Petazzoni @ 2017-05-04 20:32 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=1ae2a571381b849334b27a2b063705834c292367
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
[Arnout: don't split up the fuse2fs CONF_OPTS and DEPENDENCIES
handling]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/e2fsprogs/e2fsprogs.mk | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 632fdc2..a60c69b 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -40,12 +40,12 @@ HOST_E2FSPROGS_CONF_OPTS = \
E2FSPROGS_CONF_OPTS = \
--bindir=/bin \
--sbindir=/sbin \
- $(if $(BR2_STATIC_LIBS),,--enable-elf-shlibs) \
- $(if $(BR2_PACKAGE_E2FSPROGS_DEBUGFS),,--disable-debugfs) \
- $(if $(BR2_PACKAGE_E2FSPROGS_E2IMAGE),,--disable-imager) \
- $(if $(BR2_PACKAGE_E2FSPROGS_E4DEFRAG),,--disable-defrag) \
+ $(if $(BR2_STATIC_LIBS),--disable-elf-shlibs,--enable-elf-shlibs) \
+ $(if $(BR2_PACKAGE_E2FSPROGS_DEBUGFS),--enable-debugfs,--disable-debugfs) \
+ $(if $(BR2_PACKAGE_E2FSPROGS_E2IMAGE),--enable-imager,--disable-imager) \
+ $(if $(BR2_PACKAGE_E2FSPROGS_E4DEFRAG),--enable-defrag,--disable-defrag) \
$(if $(BR2_PACKAGE_E2FSPROGS_FSCK),--enable-fsck,--disable-fsck) \
- $(if $(BR2_PACKAGE_E2FSPROGS_RESIZE2FS),,--disable-resizer) \
+ $(if $(BR2_PACKAGE_E2FSPROGS_RESIZE2FS),--enable-resizer,--disable-resizer) \
--disable-uuidd \
--disable-libblkid \
--disable-libuuid \
^ permalink raw reply related
* [Buildroot] [git commit] e2fsprogs: disable unneeded features for host
From: Thomas Petazzoni @ 2017-05-04 20:32 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=1a56b14d57b2326c9a3e8b9f53eddc17b541504a
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
We don't need e2initrd_helper or the test I/O manager for the host, just
like we don't need it for the target.
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
[Arnout: don't add --disable-rpath, since we *do* need rpath for the
host; otherwise we have to explicitly pass LD_LIBRARY_PATH to be able
to run tools linked with util-linux' libuuid/libblkid]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/e2fsprogs/e2fsprogs.mk | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index e0a7fa9..632fdc2 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -28,10 +28,12 @@ endif
# Disable fuse2fs as well to avoid carrying over deps, and it's unused
HOST_E2FSPROGS_CONF_OPTS = \
--disable-defrag \
+ --disable-e2initrd-helper \
--disable-fuse2fs \
--disable-libblkid \
--disable-libuuid \
- --enable-symlink-install
+ --enable-symlink-install \
+ --disable-testio-debug
# Set the binary directories to "/bin" and "/sbin" to override programs
# installed by busybox.
^ permalink raw reply related
* [Buildroot] [git commit] e2fsprogs: add help text for all config options
From: Thomas Petazzoni @ 2017-05-04 20:32 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=888ea6e557c9f977aa6007026507beaeb9c1a566
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/e2fsprogs/Config.in | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in
index 676327d..23c4db5 100644
--- a/package/e2fsprogs/Config.in
+++ b/package/e2fsprogs/Config.in
@@ -23,14 +23,20 @@ if BR2_PACKAGE_E2FSPROGS
config BR2_PACKAGE_E2FSPROGS_DEBUGFS
bool "debugfs"
+ help
+ ext2/ext3/ext4 file system debugger
config BR2_PACKAGE_E2FSPROGS_E2IMAGE
bool "e2image"
+ help
+ Save critical ext2/ext3/ext4 filesystem metadata to a file
config BR2_PACKAGE_E2FSPROGS_E4DEFRAG
bool "e4defrag"
depends on !BR2_nios2 # fallocate not implemented
depends on !BR2_TOOLCHAIN_USES_UCLIBC # sync_file_range not impl
+ help
+ Online defragmenter for ext4 filesystem
comment "e4defrag needs a glibc or musl toolchain"
depends on !BR2_nios2
@@ -39,17 +45,24 @@ comment "e4defrag needs a glibc or musl toolchain"
config BR2_PACKAGE_E2FSPROGS_FSCK
bool "fsck"
default y
+ help
+ Check and repair a Linux file system. This is a wrapper around
+ the filesystem-specific fsck tools.
config BR2_PACKAGE_E2FSPROGS_FUSE2FS
bool "fuse2fs"
depends on !BR2_STATIC_LIBS # libfuse
depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse
select BR2_PACKAGE_LIBFUSE
+ help
+ FUSE file system client for ext2/ext3/ext4 file systems
comment "fuse2fs needs a toolchain w/ threads, dynamic library"
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
config BR2_PACKAGE_E2FSPROGS_RESIZE2FS
bool "resize2fs"
+ help
+ ext2/ext3/ext4 file system resizer
endif
^ permalink raw reply related
* [Buildroot] [PATCH] luvi: fix build
From: Francois Perrad @ 2017-05-04 20:29 UTC (permalink / raw)
To: buildroot
broken by LuaJIT 2.0.4 --> 2.0.5
see http://autobuild.buildroot.net/results/3ee/3eef12dbe07fb375e87b2b2898dcc5ef0c11e7a5/build-end.log
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/luvi/luvi.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/luvi/luvi.mk b/package/luvi/luvi.mk
index ade63f5f..3b2094c4 100644
--- a/package/luvi/luvi.mk
+++ b/package/luvi/luvi.mk
@@ -33,7 +33,7 @@ LUVI_CONF_OPTS = \
-DBUILD_SHARED_LIBS=OFF \
-DWithSharedLibluv=ON \
-DTARGET_ARCH=$(LUVI_TARGET_ARCH) \
- -DLUA_PATH=$(HOST_DIR)/usr/share/luajit-2.0.4/?.lua
+ -DLUA_PATH=$(HOST_DIR)/usr/share/luajit-$(LUAJIT_VERSION)/?.lua
# Add "rex" module (PCRE via bundled lrexlib)
ifeq ($(BR2_PACKAGE_PCRE),y)
--
2.11.0
^ permalink raw reply related
* [Buildroot] [PATCH v2 05/10] package/python-scandir: New package
From: Andrey Smirnov @ 2017-05-04 20:27 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170504221841.0eb0f3a6@free-electrons.com>
On Thu, May 4, 2017 at 1:18 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Hello,
>
> On Thu, 27 Apr 2017 14:33:35 -0700, Andrey Smirnov wrote:
>
>> +config BR2_PACKAGE_PYTHON_SCANDIR
>> + bool "python-scandir"
>> + help
>> + A configuration system for Python applications.
>
> This description is bogus.
>
>> + https://pypi.python.org/pypi/pickleshare
>
> This URL is wrong.
>
> And the entry to DEVELOPERS file is missing.
>
> Could you please check your entire series, and verify all those
> details? Once they are all fixed, could you resubmit an updated version?
Sorry about that, my bad. I'll re-check the series and submit v3.
>
> Please verify the dependencies and licenses as well.
Will do.
Thanks,
Andrey Smirnov
^ permalink raw reply
* [Buildroot] [git commit] e2fsprogs: refactor to fix conflicts with busybox and util-linux
From: Thomas Petazzoni @ 2017-05-04 20:26 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=742d6bf13e5bddc5e30edeb8b8c314f47cf97e4d
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
So far we attempted to solve the conflicts between busybox and e2fsprogs
by removing busybox programs from /bin and /sbin, leaving the e2fsprogs
ones at /usr/bin and /usr/sbin. This fails with BR2_ROOTFS_MERGED_USR=y,
leading to situations like the one described in bug 9436.
We could provide a better solution by means of a fine-grained selection
of programs, like util-linux does, but this would require big changes in
e2fsprogs. So instead of resorting to dirty tricks we switch to a more
pragmatic approach:
- Drop all configs to select/deselect utilities without corresponding
enable/disable options to the configure script. In other words, we
always install the basic set of utilities.
- fsck has a configure option, so use it. Note that --enable-fsck is
only about the wrapper, not about e2fsck.
- Install e2fsprogs utilities at /bin and /sbin, overriding the ones
eventually installed by busybox.
- Let the e2fsprogs build system create the symlinks mkfs.ext2 -> mke2fs
etc. fsck.ext4dev and mkfs.ext4dev were dropped in version 1.43.4.
Notice that these changes do exactly the opposite of what is requested
in bug 9436. On the other hand the policy for e2fsprogs becomes coherent
with the one for util-linux: busybox never wins.
Fixes:
https://bugs.busybox.net/show_bug.cgi?id=9436 (no fix, in fact)
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
[Arnout:
- don't add 'default y' to resize2fs;
- don't install the host package in /bin instead of /usr/bin - we
install everything under /usr (until /usr will be removed, soon)]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/e2fsprogs/Config.in | 60 +++---------------------
package/e2fsprogs/e2fsprogs.mk | 102 ++++++-----------------------------------
2 files changed, 22 insertions(+), 140 deletions(-)
diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in
index 79b77ea..676327d 100644
--- a/package/e2fsprogs/Config.in
+++ b/package/e2fsprogs/Config.in
@@ -7,47 +7,26 @@ menuconfig BR2_PACKAGE_E2FSPROGS
help
The EXT2 file system utilities.
+ The following programs are always built and installed:
+ badblocks chattr debugfs dumpe2fs e2freefrag e2fsck e2image
+ e2undo e4crypt e4defrag filefrag fsck fuse2fs logsave lsattr
+ mke2fs mklost+found resize2fs tune2fs
+
The uuid utilities (uuidd, uuidgen) are not built. Use the
ones from util-linux, instead.
+ Other programs can be selected individually.
+
http://e2fsprogs.sourceforge.net
if BR2_PACKAGE_E2FSPROGS
-config BR2_PACKAGE_E2FSPROGS_BADBLOCKS
- bool "badblocks"
- default y
-
-config BR2_PACKAGE_E2FSPROGS_CHATTR
- bool "chattr"
- default y
-
config BR2_PACKAGE_E2FSPROGS_DEBUGFS
bool "debugfs"
-config BR2_PACKAGE_E2FSPROGS_DUMPE2FS
- bool "dumpe2fs"
- default y
-
-config BR2_PACKAGE_E2FSPROGS_E2FREEFRAG
- bool "e2freefrag"
- default y
-
-config BR2_PACKAGE_E2FSPROGS_E2FSCK
- bool "e2fsck"
- default y
-
config BR2_PACKAGE_E2FSPROGS_E2IMAGE
bool "e2image"
-config BR2_PACKAGE_E2FSPROGS_E2LABEL
- bool "e2label"
- default y
-
-config BR2_PACKAGE_E2FSPROGS_E2UNDO
- bool "e2undo"
- default y
-
config BR2_PACKAGE_E2FSPROGS_E4DEFRAG
bool "e4defrag"
depends on !BR2_nios2 # fallocate not implemented
@@ -57,10 +36,6 @@ comment "e4defrag needs a glibc or musl toolchain"
depends on !BR2_nios2
depends on BR2_TOOLCHAIN_USES_UCLIBC
-config BR2_PACKAGE_E2FSPROGS_FILEFRAG
- bool "filefrag"
- default y
-
config BR2_PACKAGE_E2FSPROGS_FSCK
bool "fsck"
default y
@@ -74,28 +49,7 @@ config BR2_PACKAGE_E2FSPROGS_FUSE2FS
comment "fuse2fs needs a toolchain w/ threads, dynamic library"
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
-config BR2_PACKAGE_E2FSPROGS_LOGSAVE
- bool "logsave"
- default y
-
-config BR2_PACKAGE_E2FSPROGS_LSATTR
- bool "lsattr"
- default y
-
-config BR2_PACKAGE_E2FSPROGS_MKE2FS
- bool "mke2fs"
- default y
-
-config BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND
- bool "mklost+found"
- default y
-
config BR2_PACKAGE_E2FSPROGS_RESIZE2FS
bool "resize2fs"
-config BR2_PACKAGE_E2FSPROGS_TUNE2FS
- bool "tune2fs"
- default y
- select BR2_PACKAGE_E2FSPROGS_E2LABEL
-
endif
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 5231a97..e0a7fa9 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -17,6 +17,12 @@ E2FSPROGS_INSTALL_STAGING = YES
E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf host-util-linux
+# If both e2fsprogs and busybox are selected, make certain e2fsprogs
+# wins the fight over who gets to have their utils actually installed
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+E2FSPROGS_DEPENDENCIES += busybox
+endif
+
# e4defrag doesn't build on older systems like RHEL5.x, and we don't
# need it on the host anyway.
# Disable fuse2fs as well to avoid carrying over deps, and it's unused
@@ -24,21 +30,27 @@ HOST_E2FSPROGS_CONF_OPTS = \
--disable-defrag \
--disable-fuse2fs \
--disable-libblkid \
- --disable-libuuid
+ --disable-libuuid \
+ --enable-symlink-install
+# Set the binary directories to "/bin" and "/sbin" to override programs
+# installed by busybox.
E2FSPROGS_CONF_OPTS = \
+ --bindir=/bin \
+ --sbindir=/sbin \
$(if $(BR2_STATIC_LIBS),,--enable-elf-shlibs) \
$(if $(BR2_PACKAGE_E2FSPROGS_DEBUGFS),,--disable-debugfs) \
$(if $(BR2_PACKAGE_E2FSPROGS_E2IMAGE),,--disable-imager) \
$(if $(BR2_PACKAGE_E2FSPROGS_E4DEFRAG),,--disable-defrag) \
+ $(if $(BR2_PACKAGE_E2FSPROGS_FSCK),--enable-fsck,--disable-fsck) \
$(if $(BR2_PACKAGE_E2FSPROGS_RESIZE2FS),,--disable-resizer) \
--disable-uuidd \
--disable-libblkid \
--disable-libuuid \
- --enable-fsck \
--disable-e2initrd-helper \
--disable-testio-debug \
- --disable-rpath
+ --disable-rpath \
+ --enable-symlink-install
ifeq ($(BR2_PACKAGE_E2FSPROGS_FUSE2FS),y)
E2FSPROGS_CONF_OPTS += --enable-fuse2fs
@@ -83,89 +95,5 @@ define HOST_E2FSPROGS_INSTALL_CMDS
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) install install-libs
endef
-# binaries to keep or remove
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_BADBLOCKS) += usr/sbin/badblocks
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_CHATTR) += usr/bin/chattr
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_DUMPE2FS) += usr/sbin/dumpe2fs
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2FREEFRAG) += usr/sbin/e2freefrag
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2FSCK) += usr/sbin/e2fsck
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2LABEL) += usr/sbin/e2label
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2UNDO) += usr/sbin/e2undo
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E4DEFRAG) += usr/sbin/e4defrag
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_FILEFRAG) += usr/sbin/filefrag
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_FSCK) += usr/sbin/fsck
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_LOGSAVE) += usr/sbin/logsave
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_LSATTR) += usr/bin/lsattr
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_MKE2FS) += usr/sbin/mke2fs
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND) += usr/sbin/mklost+found
-
-# files to remove
-E2FSPROGS_TXTTARGETS_ = \
- usr/sbin/mkfs.ext[234] \
- usr/sbin/mkfs.ext4dev \
- usr/sbin/fsck.ext[234] \
- usr/sbin/fsck.ext4dev \
- usr/sbin/tune2fs
-
-define E2FSPROGS_TARGET_REMOVE_UNNEEDED
- rm -f $(addprefix $(TARGET_DIR)/, $(E2FSPROGS_BINTARGETS_))
- rm -f $(addprefix $(TARGET_DIR)/, $(E2FSPROGS_TXTTARGETS_))
-endef
-
-E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_REMOVE_UNNEEDED
-
-define E2FSPROGS_TARGET_MKE2FS_SYMLINKS
- ln -sf mke2fs $(TARGET_DIR)/usr/sbin/mkfs.ext2
- ln -sf mke2fs $(TARGET_DIR)/usr/sbin/mkfs.ext3
- ln -sf mke2fs $(TARGET_DIR)/usr/sbin/mkfs.ext4
- ln -sf mke2fs $(TARGET_DIR)/usr/sbin/mkfs.ext4dev
-endef
-
-ifeq ($(BR2_PACKAGE_E2FSPROGS_MKE2FS),y)
-E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_MKE2FS_SYMLINKS
-endif
-
-define E2FSPROGS_TARGET_E2FSCK_SYMLINKS
- ln -sf e2fsck $(TARGET_DIR)/usr/sbin/fsck.ext2
- ln -sf e2fsck $(TARGET_DIR)/usr/sbin/fsck.ext3
- ln -sf e2fsck $(TARGET_DIR)/usr/sbin/fsck.ext4
- ln -sf e2fsck $(TARGET_DIR)/usr/sbin/fsck.ext4dev
-endef
-
-ifeq ($(BR2_PACKAGE_E2FSPROGS_E2FSCK),y)
-E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_E2FSCK_SYMLINKS
-endif
-
-# If BusyBox is included, its configuration may supply its own variant
-# of ext2-related tools. Since Buildroot desires having full blown
-# variants take precedence (in this case, e2fsprogs), we want to remove
-# BusyBox's variant of e2fsprogs provided binaries. e2fsprogs targets
-# /usr/{bin,sbin} where BusyBox targets /{bin,sbin}. We will attempt to
-# remove BusyBox-generated ext2-related tools from /{bin,sbin}. We need
-# to do this in the pre-install stage to ensure we do not accidentally
-# remove e2fsprogs's binaries in usr-merged environments (ie. if they
-# are removed, they would be re-installed in this package's install
-# stage).
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-E2FSPROGS_DEPENDENCIES += busybox
-
-define E2FSPROGS_REMOVE_BUSYBOX_APPLETS
- $(RM) -f $(TARGET_DIR)/bin/chattr
- $(RM) -f $(TARGET_DIR)/bin/lsattr
- $(RM) -f $(TARGET_DIR)/sbin/fsck
- $(RM) -f $(TARGET_DIR)/sbin/tune2fs
- $(RM) -f $(TARGET_DIR)/sbin/e2label
-endef
-E2FSPROGS_PRE_INSTALL_TARGET_HOOKS += E2FSPROGS_REMOVE_BUSYBOX_APPLETS
-endif
-
-define E2FSPROGS_TARGET_TUNE2FS_SYMLINK
- ln -sf e2label $(TARGET_DIR)/usr/sbin/tune2fs
-endef
-
-ifeq ($(BR2_PACKAGE_E2FSPROGS_TUNE2FS),y)
-E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_TUNE2FS_SYMLINK
-endif
-
$(eval $(autotools-package))
$(eval $(host-autotools-package))
^ permalink raw reply related
* [Buildroot] [git commit] lua-resty-http: new package
From: Thomas Petazzoni @ 2017-05-04 20:23 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=e88995f065986dc56ce5a7c222f7a9f6cbff2b94
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Semyon Kolganov <semenak94@mail.ru>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
DEVELOPERS | 1 +
package/Config.in | 1 +
package/lua-resty-http/Config.in | 6 ++++++
package/lua-resty-http/lua-resty-http.hash | 2 ++
package/lua-resty-http/lua-resty-http.mk | 12 ++++++++++++
5 files changed, 22 insertions(+)
diff --git a/DEVELOPERS b/DEVELOPERS
index d28e6fb..8fbb69a 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1434,6 +1434,7 @@ F: package/yaml-cpp/
N: Semyon Kolganov <semenak94@mail.ru>
F: package/fmt/
F: package/libbson/
+F: package/lua-resty-http/
F: package/mpir/
N: Sergio Prado <sergio.prado@e-labworks.com>
diff --git a/package/Config.in b/package/Config.in
index 47ad2c2..1af8150 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -571,6 +571,7 @@ menu "Lua libraries/modules"
source "package/luajson/Config.in"
source "package/lualogging/Config.in"
source "package/luaposix/Config.in"
+ source "package/lua-resty-http/Config.in"
source "package/luasec/Config.in"
source "package/luasocket/Config.in"
source "package/luasql-sqlite3/Config.in"
diff --git a/package/lua-resty-http/Config.in b/package/lua-resty-http/Config.in
new file mode 100644
index 0000000..4697c90
--- /dev/null
+++ b/package/lua-resty-http/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LUA_RESTY_HTTP
+ bool "lua-resty-http"
+ help
+ Lua HTTP client cosocket driver for OpenResty / ngx_lua.
+
+ http://github.com/pintsized/lua-resty-http
diff --git a/package/lua-resty-http/lua-resty-http.hash b/package/lua-resty-http/lua-resty-http.hash
new file mode 100644
index 0000000..02c5659
--- /dev/null
+++ b/package/lua-resty-http/lua-resty-http.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 3d30dd5a273438e39741fcf87ae5e147d8700bd8faa7dfe9916ea425f9c716f7 lua-resty-http-0.10-0.src.rock
diff --git a/package/lua-resty-http/lua-resty-http.mk b/package/lua-resty-http/lua-resty-http.mk
new file mode 100644
index 0000000..927fdae
--- /dev/null
+++ b/package/lua-resty-http/lua-resty-http.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# lua-resty-http
+#
+################################################################################
+
+LUA_RESTY_HTTP_VERSION = 0.10-0
+LUA_RESTY_HTTP_SUBDIR = lua-resty-http
+LUA_RESTY_HTTP_LICENSE = BSD-2-Clause
+LUA_RESTY_HTTP_LICENSE_FILES = LICENSE
+
+$(eval $(luarocks-package))
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox