mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH v3] libcap: Version bump 2.51 -> 2.62.
@ 2022-01-07  9:26 Christian Melki
  2022-01-21  7:19 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Christian Melki @ 2022-01-07  9:26 UTC (permalink / raw)
  To: ptxdist

Update posix capability library.

Change CC only directive to CROSS_COMPILE so that the new version can
build properly with cross builds.

For host-libcap, change BUILD_GPERF to USE_GPERF, as the former is now a
reserved word.

Drop old patches.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 .../0001-Fix-build-on-non-Linux-host.patch    | 41 -------------------
 patches/libcap-2.51/series                    |  4 --
 rules/host-libcap.make                        |  2 +-
 rules/libcap.make                             |  6 +--
 4 files changed, 4 insertions(+), 49 deletions(-)
 delete mode 100644 patches/libcap-2.51/0001-Fix-build-on-non-Linux-host.patch
 delete mode 100644 patches/libcap-2.51/series

diff --git a/patches/libcap-2.51/0001-Fix-build-on-non-Linux-host.patch b/patches/libcap-2.51/0001-Fix-build-on-non-Linux-host.patch
deleted file mode 100644
index e9b75e835..000000000
--- a/patches/libcap-2.51/0001-Fix-build-on-non-Linux-host.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Bernhard Walle <bernhard@bwalle.de>
-Date: Sun, 8 Apr 2012 17:55:56 +0200
-Subject: [PATCH] Fix build on non-Linux host
-
-Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- libcap/include/sys/capability.h        | 1 -
- libcap/include/uapi/linux/capability.h | 6 ++++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/libcap/include/sys/capability.h b/libcap/include/sys/capability.h
-index d172ddcb2ba8..4d1eea6f2a26 100644
---- a/libcap/include/sys/capability.h
-+++ b/libcap/include/sys/capability.h
-@@ -21,7 +21,6 @@ extern "C" {
- 
- #include <sys/types.h>
- #include <stdint.h>
--#include <linux/types.h>
- 
- #ifndef __user
- #define __user
-diff --git a/libcap/include/uapi/linux/capability.h b/libcap/include/uapi/linux/capability.h
-index 09b556389a87..9e659e379659 100644
---- a/libcap/include/uapi/linux/capability.h
-+++ b/libcap/include/uapi/linux/capability.h
-@@ -14,7 +14,13 @@
- #ifndef _UAPI_LINUX_CAPABILITY_H
- #define _UAPI_LINUX_CAPABILITY_H
- 
-+#ifdef __linux__
- #include <linux/types.h>
-+#else
-+#include <stdint.h>
-+typedef uint32_t __u32;
-+typedef uint32_t __le32;
-+#endif
- 
- /* User-level do most of the mapping between kernel and user
-    capabilities based on the version tag given by the kernel. The
diff --git a/patches/libcap-2.51/series b/patches/libcap-2.51/series
deleted file mode 100644
index 4f7f7421b..000000000
--- a/patches/libcap-2.51/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Fix-build-on-non-Linux-host.patch
-# 69b7a8db215659ad00eab9b8ed2ab43e  - git-ptx-patches magic
diff --git a/rules/host-libcap.make b/rules/host-libcap.make
index 2faae99c3..695ce6c44 100644
--- a/rules/host-libcap.make
+++ b/rules/host-libcap.make
@@ -19,7 +19,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_LIBCAP) += host-libcap
 HOST_LIBCAP_MAKE_OPT := \
 	prefix= \
 	lib=lib \
-	BUILD_GPERF=no \
+	USE_GPERF=no \
 	PAM_CAP=no \
 	GOLANG=no \
 	LIBATTR=no \
diff --git a/rules/libcap.make b/rules/libcap.make
index 5ed11b1f3..df1eeef16 100644
--- a/rules/libcap.make
+++ b/rules/libcap.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBCAP) += libcap
 #
 # Paths and names
 #
-LIBCAP_VERSION	:= 2.51
-LIBCAP_MD5	:= 4c9febc1bf0afca6a4d9f86fcdb6d900
+LIBCAP_VERSION	:= 2.62
+LIBCAP_MD5	:= 342c7560ed2103899f6914d1de75a89f
 LIBCAP		:= libcap-$(LIBCAP_VERSION)
 LIBCAP_SUFFIX	:= tar.xz
 LIBCAP_URL	:= \
@@ -31,7 +31,7 @@ LIBCAP_LICENSE_FILES := file://License;md5=e2370ba375efe9e1a095c26d37e483b8
 
 LIBCAP_MAKE_OPT	:= \
 	prefix=/usr lib=$(CROSS_LIB_DIR) \
-	CC=$(CROSS_CC) \
+	CROSS_COMPILE=$(COMPILER_PREFIX) \
 	BUILD_CC=$(HOSTCC) \
 	DYNAMIC=yes \
 	GOLANG=no \
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [ptxdist] [APPLIED] libcap: Version bump 2.51 -> 2.62.
  2022-01-07  9:26 [ptxdist] [PATCH v3] libcap: Version bump 2.51 -> 2.62 Christian Melki
@ 2022-01-21  7:19 ` Michael Olbrich
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2022-01-21  7:19 UTC (permalink / raw)
  To: ptxdist; +Cc: Christian Melki

Thanks, applied as 11a9af330520170ad6c39bdf670c0bf728d5678a.

Michael

[sent from post-receive hook]

On Fri, 21 Jan 2022 08:19:27 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> Update posix capability library.
> 
> Change CC only directive to CROSS_COMPILE so that the new version can
> build properly with cross builds.
> 
> For host-libcap, change BUILD_GPERF to USE_GPERF, as the former is now a
> reserved word.
> 
> Drop old patches.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220107092616.27746-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/libcap-2.51/0001-Fix-build-on-non-Linux-host.patch b/patches/libcap-2.51/0001-Fix-build-on-non-Linux-host.patch
> deleted file mode 100644
> index e9b75e835276..000000000000
> --- a/patches/libcap-2.51/0001-Fix-build-on-non-Linux-host.patch
> +++ /dev/null
> @@ -1,41 +0,0 @@
> -From: Bernhard Walle <bernhard@bwalle.de>
> -Date: Sun, 8 Apr 2012 17:55:56 +0200
> -Subject: [PATCH] Fix build on non-Linux host
> -
> -Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
> -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> ----
> - libcap/include/sys/capability.h        | 1 -
> - libcap/include/uapi/linux/capability.h | 6 ++++++
> - 2 files changed, 6 insertions(+), 1 deletion(-)
> -
> -diff --git a/libcap/include/sys/capability.h b/libcap/include/sys/capability.h
> -index d172ddcb2ba8..4d1eea6f2a26 100644
> ---- a/libcap/include/sys/capability.h
> -+++ b/libcap/include/sys/capability.h
> -@@ -21,7 +21,6 @@ extern "C" {
> - 
> - #include <sys/types.h>
> - #include <stdint.h>
> --#include <linux/types.h>
> - 
> - #ifndef __user
> - #define __user
> -diff --git a/libcap/include/uapi/linux/capability.h b/libcap/include/uapi/linux/capability.h
> -index 09b556389a87..9e659e379659 100644
> ---- a/libcap/include/uapi/linux/capability.h
> -+++ b/libcap/include/uapi/linux/capability.h
> -@@ -14,7 +14,13 @@
> - #ifndef _UAPI_LINUX_CAPABILITY_H
> - #define _UAPI_LINUX_CAPABILITY_H
> - 
> -+#ifdef __linux__
> - #include <linux/types.h>
> -+#else
> -+#include <stdint.h>
> -+typedef uint32_t __u32;
> -+typedef uint32_t __le32;
> -+#endif
> - 
> - /* User-level do most of the mapping between kernel and user
> -    capabilities based on the version tag given by the kernel. The
> diff --git a/patches/libcap-2.51/series b/patches/libcap-2.51/series
> deleted file mode 100644
> index 4f7f7421b332..000000000000
> --- a/patches/libcap-2.51/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-Fix-build-on-non-Linux-host.patch
> -# 69b7a8db215659ad00eab9b8ed2ab43e  - git-ptx-patches magic
> diff --git a/rules/host-libcap.make b/rules/host-libcap.make
> index 2faae99c3c9a..695ce6c4484f 100644
> --- a/rules/host-libcap.make
> +++ b/rules/host-libcap.make
> @@ -19,7 +19,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_LIBCAP) += host-libcap
>  HOST_LIBCAP_MAKE_OPT := \
>  	prefix= \
>  	lib=lib \
> -	BUILD_GPERF=no \
> +	USE_GPERF=no \
>  	PAM_CAP=no \
>  	GOLANG=no \
>  	LIBATTR=no \
> diff --git a/rules/libcap.make b/rules/libcap.make
> index 5ed11b1f35a2..df1eeef16c1d 100644
> --- a/rules/libcap.make
> +++ b/rules/libcap.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBCAP) += libcap
>  #
>  # Paths and names
>  #
> -LIBCAP_VERSION	:= 2.51
> -LIBCAP_MD5	:= 4c9febc1bf0afca6a4d9f86fcdb6d900
> +LIBCAP_VERSION	:= 2.62
> +LIBCAP_MD5	:= 342c7560ed2103899f6914d1de75a89f
>  LIBCAP		:= libcap-$(LIBCAP_VERSION)
>  LIBCAP_SUFFIX	:= tar.xz
>  LIBCAP_URL	:= \
> @@ -31,7 +31,7 @@ LIBCAP_LICENSE_FILES := file://License;md5=e2370ba375efe9e1a095c26d37e483b8
>  
>  LIBCAP_MAKE_OPT	:= \
>  	prefix=/usr lib=$(CROSS_LIB_DIR) \
> -	CC=$(CROSS_CC) \
> +	CROSS_COMPILE=$(COMPILER_PREFIX) \
>  	BUILD_CC=$(HOSTCC) \
>  	DYNAMIC=yes \
>  	GOLANG=no \

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-01-21  7:22 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-07  9:26 [ptxdist] [PATCH v3] libcap: Version bump 2.51 -> 2.62 Christian Melki
2022-01-21  7:19 ` [ptxdist] [APPLIED] " Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox