Skip to contentSkip to conversation

package/udftools: bump to version 2.0.1

PATCH New Fabrice Fontaine 3 participants 3 messages Sep 28, 2019 – Sep 29, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/udftools: bump to version 2.0.1

- Drop first and third patches (already in version)
- Add two upstream patches and refresh second one so that it applies cleanly

---
 ...figure-Use-AS_IF-macro-for-C99-check.patch | 27 +++++++
 ...tsetup.c-do-not-include-bits-types.h.patch | 32 --------
 ...Allow-to-build-udftools-without-udev.patch | 49 +++++++++++
 ...ect-readline-via-pkg-config-when-pos.patch | 60 --------------
 ...event-build-breakage-with-glibc-2-25.patch | 38 ---------
 ...ect-readline-via-pkg-config-when-pos.patch | 81 +++++++++++++++++++
 package/udftools/udftools.hash                |  2 +-
 package/udftools/udftools.mk                  |  2 +-
 8 files changed, 159 insertions(+), 132 deletions(-)
 create mode 100644 package/udftools/0001-configure-Use-AS_IF-macro-for-C99-check.patch
 delete mode 100644 package/udftools/0001-pktsetup-pktsetup.c-do-not-include-bits-types.h.patch
 create mode 100644 package/udftools/0002-all-Allow-to-build-udftools-without-udev.patch
 delete mode 100644 package/udftools/0002-configure.ac-detect-readline-via-pkg-config-when-pos.patch
 delete mode 100644 package/udftools/0003-Include-sys-sysmacros-h-to-prevent-build-breakage-with-glibc-2-25.patch
 create mode 100644 package/udftools/0003-configure.ac-detect-readline-via-pkg-config-when-pos.patch
package/udftools/0001-configure-Use-AS_IF-macro-for-C99-check.patch new file +27 -0
new file mode 100644
index 0000000000..b4770f7df2
@@ -0,0 +1,27 @@
+From 02a32d8827e884730d22ddee4c479577cd1e90ac Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <[email protected]>
+Date: Wed, 26 Jun 2019 17:41:54 +0200
+Subject: [PATCH] configure: Use AS_IF macro for C99 check
+
+[Retrieved from:
+https://github.com/pali/udftools/commit/02a32d8827e884730d22ddee4c479577cd1e90ac]
+Signed-off-by: Fabrice Fontaine <[email protected]>
+---
+ configure.ac | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2db31d0..315fb26 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -10,9 +10,7 @@ AC_PROG_CC_C99
+ AC_DISABLE_SHARED
+ AM_PROG_LIBTOOL
+ 
+-if test "$ac_cv_prog_cc_c99" = "no"; then
+-	AC_MSG_ERROR([Your C compiler does not support ISO C99.])
+-fi
++AS_IF([test "$ac_cv_prog_cc_c99" = "no"], [AC_MSG_ERROR([Your C compiler does not support ISO C99.])])
+ 
+ dnl Checks for libraries.
+ AC_CHECK_LIB(readline, readline, [ ])
package/udftools/0001-pktsetup-pktsetup.c-do-not-include-bits-types.h.patch deleted +0 -32
deleted file mode 100644
index 4d842821aa..0000000000
@@ -1,32 +0,0 @@
-From 8da4dde42cc25294819ad078432d85437e4a12ee Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Sun, 22 Apr 2018 15:05:46 +0200
-Subject: [PATCH] pktsetup/pktsetup.c: do not include <bits/types.h>
-
-This header is not a standard header, and is for example not provided
-by the musl C library.
-
-This change has been tested by building udftools against glibc, uClibc
-and musl.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-Upstream-status: https://github.com/pali/udftools/pull/16
----
- pktsetup/pktsetup.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/pktsetup/pktsetup.c b/pktsetup/pktsetup.c
-index 8b3df51..81ed142 100644
---- a/pktsetup/pktsetup.c
-+++ b/pktsetup/pktsetup.c
-@@ -27,7 +27,6 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <getopt.h>
--#include <bits/types.h>
- #include <sys/types.h>
- #include <string.h>
- #include <limits.h>
--- 
-2.14.3
-
package/udftools/0002-all-Allow-to-build-udftools-without-udev.patch new file +49 -0

49 lines not on this page · raw message

package/udftools/0002-configure.ac-detect-readline-via-pkg-config-when-pos.patch deleted +0 -60

60 lines not on this page · raw message

package/udftools/0003-Include-sys-sysmacros-h-to-prevent-build-breakage-with-glibc-2-25.patch deleted +0 -38
deleted file mode 100644
index ac56715d62..0000000000
@@ -1,38 +0,0 @@
-From cca194f17fe2892c929acab2f1d5016ad38aa305 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <[email protected]>
-Date: Tue, 2 Jan 2018 15:10:34 +0100
-Subject: [PATCH] Include <sys/sysmacros.h> to prevent build breakage with
- >=glibc-2.25
-
-libtool: link: x86_64-pc-linux-gnu-gcc -march=native -mtune=native -O2
--pipe -Wl,-O1 -Wl,--hash-style=gnu -Wl,--sort-common -Wl,--as-needed -o
-mkudffs main.o mkudffs.o defaults.o file.o options.o
-../libudffs/.libs/libudffs.a
-main.o: In function `is_whole_disk':
-main.c:(.text+0x2ce): undefined reference to `major'
-main.c:(.text+0x2dd): undefined reference to `minor'
-main.o: In function `main':
-main.c:(.text.startup+0x72f): undefined reference to `minor'
-main.c:(.text.startup+0x741): undefined reference to `major'
-collect2: error: ld returned 1 exit status
-make[1]: *** [Makefile:378: mkudffs] Error 1
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
-[Retrieved from
-https://github.com/pali/udftools/commit/cca194f17fe2892c929acab2f1d5016ad38aa305]
----
- mkudffs/main.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/mkudffs/main.c b/mkudffs/main.c
-index 066afac..3e306ac 100644
---- a/mkudffs/main.c
-+++ b/mkudffs/main.c
-@@ -43,6 +43,7 @@
- #include <sys/ioctl.h>
- #include <linux/fs.h>
- #include <linux/fd.h>
-+#include <sys/sysmacros.h>
- 
- #include "mkudffs.h"
- #include "defaults.h"
package/udftools/0003-configure.ac-detect-readline-via-pkg-config-when-pos.patch new file +81 -0

81 lines not on this page · raw message

package/udftools/udftools.hash +1 -1
index 837a515726..4b3a6288d1 100644
@@ -1,3 +1,3 @@
 # Locally computed
-sha256	67fe428d452901215cfad8049d250540c97114b1a20dd63277b91c2c4fae8292	udftools-2.0.tar.gz
+sha256	783221bcc2518ea480cee01ceeb8825db7a089f4e986b557f6460f89636142b6	udftools-2.1.tar.gz
 sha256	dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa	COPYING
package/udftools/udftools.mk +1 -1
index e5bf59137e..ca2ec32065 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-UDFTOOLS_VERSION = 2.0
+UDFTOOLS_VERSION = 2.1
 UDFTOOLS_SITE = https://github.com/pali/udftools/releases/download/$(UDFTOOLS_VERSION)
 UDFTOOLS_LICENSE = GPL-2.0+
 UDFTOOLS_LICENSE_FILES = COPYING
Signature · 1 line
2.23.0
#1 lore raw

PATCH 1/1 package/udftools: bump to version 2.0.1

Quoted 5 lines · On Sat, 28 Sep 2019 09:06:04 +0200 Fabrice Fontaine…

- Drop first and third patches (already in version)
- Add two upstream patches and refresh second one so that it applies cleanly

Quoted 16 lines
---
 ...figure-Use-AS_IF-macro-for-C99-check.patch | 27 +++++++
 ...tsetup.c-do-not-include-bits-types.h.patch | 32 --------
 ...Allow-to-build-udftools-without-udev.patch | 49 +++++++++++
 ...ect-readline-via-pkg-config-when-pos.patch | 60 --------------
 ...event-build-breakage-with-glibc-2-25.patch | 38 ---------
 ...ect-readline-via-pkg-config-when-pos.patch | 81 +++++++++++++++++++
 package/udftools/udftools.hash                |  2 +-
 package/udftools/udftools.mk                  |  2 +-
 8 files changed, 159 insertions(+), 132 deletions(-)
 create mode 100644 package/udftools/0001-configure-Use-AS_IF-macro-for-C99-check.patch
 delete mode 100644 package/udftools/0001-pktsetup-pktsetup.c-do-not-include-bits-types.h.patch
 create mode 100644 package/udftools/0002-all-Allow-to-build-udftools-without-udev.patch
 delete mode 100644 package/udftools/0002-configure.ac-detect-readline-via-pkg-config-when-pos.patch
 delete mode 100644 package/udftools/0003-Include-sys-sysmacros-h-to-prevent-build-breakage-with-glibc-2-25.patch
 create mode 100644 package/udftools/0003-configure.ac-detect-readline-via-pkg-config-when-pos.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Applied
#2 lore raw

PATCH 1/1 package/udftools: bump to version 2.0.1

Thank you

Steve Kenton

On September 28, 2019 3:40:53 PM CDT, Thomas Petazzoni <[email protected]> wrote:

On Sat, 28 Sep 2019 09:06:04 +0200
Fabrice Fontaine <[email protected]> wrote:

- Drop first and third patches (already in version)
- Add two upstream patches and refresh second one so that it applies cleanly

________________________________

 ...figure-Use-AS_IF-macro-for-C99-check.patch | 27 +++++++
 ...tsetup.c-do-not-include-bits-types.h.patch | 32 --------
 ...Allow-to-build-udftools-without-udev.patch | 49 +++++++++++
 ...ect-readline-via-pkg-config-when-pos.patch | 60 --------------
 ...event-build-breakage-with-glibc-2-25.patch | 38 ---------
 ...ect-readline-via-pkg-config-when-pos.patch | 81 +++++++++++++++++++
 package/udftools/udftools.hash                |  2 +-
 package/udftools/udftools.mk                  |  2 +-
 8 files changed, 159 insertions(+), 132 deletions(-)
 create mode 100644 package/udftools/0001-configure-Use-AS_IF-macro-for-C99-check.patch
 delete mode 100644 package/udftools/0001-pktsetup-pktsetup.c-do-not-include-bits-types.h.patch
 create mode 100644 package/udftools/0002-all-Allow-to-build-udftools-without-udev.patch
 delete mode 100644 package/udftools/0002-configure.ac-detect-readline-via-pkg-config-when-pos.patch
 delete mode 100644 package/udftools/0003-Include-sys-sysmacros-h-to-prevent-build-breakage-with-glibc-2-25.patch
 create mode 100644 package/udftools/0003-configure.ac-detect-readline-via-pkg-config-when-pos.patch

Applied to master, thanks.

Thomas
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190929/59f92d32/attachment.html>