* [Buildroot] [PATCH 1/1] package/libqmi: bump version to 1.30.4
@ 2022-02-21 19:21 Petr Vorel
2022-03-12 17:02 ` Arnout Vandecappelle
0 siblings, 1 reply; 2+ messages in thread
From: Petr Vorel @ 2022-02-21 19:21 UTC (permalink / raw)
To: buildroot; +Cc: Matt Weber, Aleksander Morgado
Remove 0001-build-add-an-option-to-not-build-man-pages.patch
as release contains very similar commit which does autodetection:
1a474db ("build: add an option to not build man pages")
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
Tested:
bootlin-armv5-uclibc [1/6]: OK
bootlin-armv7-glibc [2/6]: OK
bootlin-armv7m-uclibc [3/6]: SKIPPED
bootlin-x86-64-musl [4/6]: OK
br-arm-full-static [5/6]: OK
sourcery-arm [6/6]: OK
andes-nds32 [ 1/45]: FAILED (not related to this change)
arm-aarch64 [ 2/45]: OK
bootlin-aarch64-glibc [ 3/45]: OK
bootlin-arcle-hs38-uclibc [ 4/45]: OK
bootlin-armv5-uclibc [ 5/45]: OK
bootlin-armv7-glibc [ 6/45]: OK
bootlin-armv7m-uclibc [ 7/45]: SKIPPED
bootlin-armv7-musl [ 8/45]: OK
bootlin-microblazeel-uclibc [ 9/45]: OK
bootlin-mipsel-uclibc [10/45]: OK
bootlin-mipsel32r6-glibc [11/45]: OK
bootlin-m68k-5208-uclibc [12/45]: SKIPPED
bootlin-m68k-68040-uclibc [13/45]: OK
bootlin-nios2-glibc [14/45]: OK
bootlin-openrisc-uclibc [15/45]: OK
bootlin-powerpc-e500mc-uclibc [16/45]: OK
bootlin-powerpc64le-power8-glibc [17/45]: OK
bootlin-riscv32-glibc [18/45]: OK
bootlin-riscv64-glibc [19/45]: OK
bootlin-riscv64-musl [20/45]: OK
bootlin-sh4-uclibc [21/45]: OK
bootlin-sparc-uclibc [22/45]: OK
bootlin-sparc64-glibc [23/45]: OK
bootlin-xtensa-uclibc [24/45]: OK
bootlin-x86-64-glibc [25/45]: OK
bootlin-x86-64-musl [26/45]: OK
bootlin-x86-64-uclibc [27/45]: OK
br-arm-basic [28/45]: SKIPPED
br-arm-full-nothread [29/45]: SKIPPED
br-arm-full-static [30/45]: OK
br-i386-pentium-mmx-musl [31/45]: OK
br-i386-pentium4-full [32/45]: OK
br-mips64-n64-full [33/45]: OK
br-mips64r6-el-hf-glibc [34/45]: OK
br-powerpc-603e-basic-cpp [35/45]: SKIPPED
br-powerpc64-power7-glibc [36/45]: OK
linaro-aarch64-be [37/45]: OK
linaro-aarch64 [38/45]: OK
linaro-arm [39/45]: OK
sourcery-arm-armv4t [40/45]: OK
sourcery-arm [41/45]: OK
sourcery-arm-thumb2 [42/45]: OK
sourcery-mips [43/45]: OK
sourcery-mips64 [44/45]: OK
sourcery-nios2 [45/45]: OK
...add-an-option-to-not-build-man-pages.patch | 65 -------------------
package/libqmi/libqmi.hash | 2 +-
package/libqmi/libqmi.mk | 2 +-
3 files changed, 2 insertions(+), 67 deletions(-)
delete mode 100644 package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch
diff --git a/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch b/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch
deleted file mode 100644
index d9053de537..0000000000
--- a/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 295b75e9c8dc895e281e36b1e8121d09fd556af0 Mon Sep 17 00:00:00 2001
-From: Aleksander Morgado <aleksander@aleksander.es>
-Date: Wed, 3 Nov 2021 10:57:51 +0100
-Subject: [PATCH] build: add an option to not build man pages
-
-When cross-compiling, the compiled binaries cannot be run on the build
-machine, unless one defines a helper (e.g. qemu) in the meson
-configuration, which is most of the time undesirable.
-
-If help2man is installed on the build machine, then the build would fail
-because of this, so add an option to disable generating the man pages.
-
-With later versions of meson, it will be possible to automatically
-detect this condition.
-
-Based on the same fix done in libmbim by Nicolas Cavallari, see
-https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/commit/792af73ea90e9689703ab526dd444fdb1c2f8e40
-
-Fixes https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/issues/75
-
-[Retrieved (and backported) from:
-https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/commit/295b75e9c8dc895e281e36b1e8121d09fd556af0]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- meson.build | 8 +++++++-
- meson_options.txt | 1 +
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index e88b43a1..c7312146 100644
---- a/meson.build
-+++ b/meson.build
-@@ -223,8 +223,8 @@ if enable_gtk_doc
- subdir('docs/reference/libqmi-glib')
- endif
-
--help2man = find_program('help2man', required: false)
--if help2man.found()
-+enable_man = get_option('man')
-+if enable_man
- subdir('docs/man')
- endif
-
-@@ -237,6 +242,7 @@ summary({
- output += ' Documentation: ' + enable_gtk_doc.to_string() + '\n'
- output += ' bash completion: ' + enable_bash_completion.to_string() + '\n'
- output += ' gobject introspection: ' + enable_gir.to_string() + '\n\n'
-+output += ' man pages: ' + enable_man.to_string() + '\n\n'
- output += ' System paths\n'
- output += ' prefix: ' + qmi_prefix + '\n'
- output += ' udev base directory: ' + qmi_username + '\n\n'
-diff --git a/meson_options.txt b/meson_options.txt
-index 4d4f913d..bee5daac 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -16,5 +16,6 @@ option('udevdir', type: 'string', value: '', description: 'where udev base direc
-
- option('introspection', type: 'boolean', value: 'auto', description: 'build introspection support')
- option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
-+option('man', type: 'boolean', value: 'true', description: 'build man pages using help2man')
-
- option('bash_completion', type: 'boolean', value: true, description: 'install bash completion files')
---
-GitLab
-
diff --git a/package/libqmi/libqmi.hash b/package/libqmi/libqmi.hash
index 1f2da45ac0..ef2da77a2a 100644
--- a/package/libqmi/libqmi.hash
+++ b/package/libqmi/libqmi.hash
@@ -1,4 +1,4 @@
# Locally computed:
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
-sha256 2eb7c7971b91a64ad830643b0170cff692a69bf0f093ca61d72d3f466a0272d4 libqmi-1.30.2.tar.gz
+sha256 82ddd3f77c602b1e0c11d3e41d0563ede11f95036ebfcf929bc89157b13928e6 libqmi-1.30.4.tar.gz
diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk
index a4839f1efb..b33e2fdc47 100644
--- a/package/libqmi/libqmi.mk
+++ b/package/libqmi/libqmi.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBQMI_VERSION = 1.30.2
+LIBQMI_VERSION = 1.30.4
LIBQMI_SITE = https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$(LIBQMI_VERSION)
LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs)
LIBQMI_LICENSE_FILES = COPYING COPYING.LIB
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/libqmi: bump version to 1.30.4
2022-02-21 19:21 [Buildroot] [PATCH 1/1] package/libqmi: bump version to 1.30.4 Petr Vorel
@ 2022-03-12 17:02 ` Arnout Vandecappelle
0 siblings, 0 replies; 2+ messages in thread
From: Arnout Vandecappelle @ 2022-03-12 17:02 UTC (permalink / raw)
To: Petr Vorel, buildroot; +Cc: Matt Weber, Aleksander Morgado
On 21/02/2022 20:21, Petr Vorel wrote:
> Remove 0001-build-add-an-option-to-not-build-man-pages.patch
> as release contains very similar commit which does autodetection:
> 1a474db ("build: add an option to not build man pages")
>
> Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
Applied to master, thanks.
Regards,
Arnout
> ---
> Tested:
>
>
> bootlin-armv5-uclibc [1/6]: OK
> bootlin-armv7-glibc [2/6]: OK
> bootlin-armv7m-uclibc [3/6]: SKIPPED
> bootlin-x86-64-musl [4/6]: OK
> br-arm-full-static [5/6]: OK
> sourcery-arm [6/6]: OK
>
> andes-nds32 [ 1/45]: FAILED (not related to this change)
> arm-aarch64 [ 2/45]: OK
> bootlin-aarch64-glibc [ 3/45]: OK
> bootlin-arcle-hs38-uclibc [ 4/45]: OK
> bootlin-armv5-uclibc [ 5/45]: OK
> bootlin-armv7-glibc [ 6/45]: OK
> bootlin-armv7m-uclibc [ 7/45]: SKIPPED
> bootlin-armv7-musl [ 8/45]: OK
> bootlin-microblazeel-uclibc [ 9/45]: OK
> bootlin-mipsel-uclibc [10/45]: OK
> bootlin-mipsel32r6-glibc [11/45]: OK
> bootlin-m68k-5208-uclibc [12/45]: SKIPPED
> bootlin-m68k-68040-uclibc [13/45]: OK
> bootlin-nios2-glibc [14/45]: OK
> bootlin-openrisc-uclibc [15/45]: OK
> bootlin-powerpc-e500mc-uclibc [16/45]: OK
> bootlin-powerpc64le-power8-glibc [17/45]: OK
> bootlin-riscv32-glibc [18/45]: OK
> bootlin-riscv64-glibc [19/45]: OK
> bootlin-riscv64-musl [20/45]: OK
> bootlin-sh4-uclibc [21/45]: OK
> bootlin-sparc-uclibc [22/45]: OK
> bootlin-sparc64-glibc [23/45]: OK
> bootlin-xtensa-uclibc [24/45]: OK
> bootlin-x86-64-glibc [25/45]: OK
> bootlin-x86-64-musl [26/45]: OK
> bootlin-x86-64-uclibc [27/45]: OK
> br-arm-basic [28/45]: SKIPPED
> br-arm-full-nothread [29/45]: SKIPPED
> br-arm-full-static [30/45]: OK
> br-i386-pentium-mmx-musl [31/45]: OK
> br-i386-pentium4-full [32/45]: OK
> br-mips64-n64-full [33/45]: OK
> br-mips64r6-el-hf-glibc [34/45]: OK
> br-powerpc-603e-basic-cpp [35/45]: SKIPPED
> br-powerpc64-power7-glibc [36/45]: OK
> linaro-aarch64-be [37/45]: OK
> linaro-aarch64 [38/45]: OK
> linaro-arm [39/45]: OK
> sourcery-arm-armv4t [40/45]: OK
> sourcery-arm [41/45]: OK
> sourcery-arm-thumb2 [42/45]: OK
> sourcery-mips [43/45]: OK
> sourcery-mips64 [44/45]: OK
> sourcery-nios2 [45/45]: OK
>
> ...add-an-option-to-not-build-man-pages.patch | 65 -------------------
> package/libqmi/libqmi.hash | 2 +-
> package/libqmi/libqmi.mk | 2 +-
> 3 files changed, 2 insertions(+), 67 deletions(-)
> delete mode 100644 package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch
>
> diff --git a/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch b/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch
> deleted file mode 100644
> index d9053de537..0000000000
> --- a/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch
> +++ /dev/null
> @@ -1,65 +0,0 @@
> -From 295b75e9c8dc895e281e36b1e8121d09fd556af0 Mon Sep 17 00:00:00 2001
> -From: Aleksander Morgado <aleksander@aleksander.es>
> -Date: Wed, 3 Nov 2021 10:57:51 +0100
> -Subject: [PATCH] build: add an option to not build man pages
> -
> -When cross-compiling, the compiled binaries cannot be run on the build
> -machine, unless one defines a helper (e.g. qemu) in the meson
> -configuration, which is most of the time undesirable.
> -
> -If help2man is installed on the build machine, then the build would fail
> -because of this, so add an option to disable generating the man pages.
> -
> -With later versions of meson, it will be possible to automatically
> -detect this condition.
> -
> -Based on the same fix done in libmbim by Nicolas Cavallari, see
> -https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/commit/792af73ea90e9689703ab526dd444fdb1c2f8e40
> -
> -Fixes https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/issues/75
> -
> -[Retrieved (and backported) from:
> -https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/commit/295b75e9c8dc895e281e36b1e8121d09fd556af0]
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ----
> - meson.build | 8 +++++++-
> - meson_options.txt | 1 +
> - 2 files changed, 8 insertions(+), 1 deletion(-)
> -
> -diff --git a/meson.build b/meson.build
> -index e88b43a1..c7312146 100644
> ---- a/meson.build
> -+++ b/meson.build
> -@@ -223,8 +223,8 @@ if enable_gtk_doc
> - subdir('docs/reference/libqmi-glib')
> - endif
> -
> --help2man = find_program('help2man', required: false)
> --if help2man.found()
> -+enable_man = get_option('man')
> -+if enable_man
> - subdir('docs/man')
> - endif
> -
> -@@ -237,6 +242,7 @@ summary({
> - output += ' Documentation: ' + enable_gtk_doc.to_string() + '\n'
> - output += ' bash completion: ' + enable_bash_completion.to_string() + '\n'
> - output += ' gobject introspection: ' + enable_gir.to_string() + '\n\n'
> -+output += ' man pages: ' + enable_man.to_string() + '\n\n'
> - output += ' System paths\n'
> - output += ' prefix: ' + qmi_prefix + '\n'
> - output += ' udev base directory: ' + qmi_username + '\n\n'
> -diff --git a/meson_options.txt b/meson_options.txt
> -index 4d4f913d..bee5daac 100644
> ---- a/meson_options.txt
> -+++ b/meson_options.txt
> -@@ -16,5 +16,6 @@ option('udevdir', type: 'string', value: '', description: 'where udev base direc
> -
> - option('introspection', type: 'boolean', value: 'auto', description: 'build introspection support')
> - option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
> -+option('man', type: 'boolean', value: 'true', description: 'build man pages using help2man')
> -
> - option('bash_completion', type: 'boolean', value: true, description: 'install bash completion files')
> ---
> -GitLab
> -
> diff --git a/package/libqmi/libqmi.hash b/package/libqmi/libqmi.hash
> index 1f2da45ac0..ef2da77a2a 100644
> --- a/package/libqmi/libqmi.hash
> +++ b/package/libqmi/libqmi.hash
> @@ -1,4 +1,4 @@
> # Locally computed:
> sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
> sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
> -sha256 2eb7c7971b91a64ad830643b0170cff692a69bf0f093ca61d72d3f466a0272d4 libqmi-1.30.2.tar.gz
> +sha256 82ddd3f77c602b1e0c11d3e41d0563ede11f95036ebfcf929bc89157b13928e6 libqmi-1.30.4.tar.gz
> diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk
> index a4839f1efb..b33e2fdc47 100644
> --- a/package/libqmi/libqmi.mk
> +++ b/package/libqmi/libqmi.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -LIBQMI_VERSION = 1.30.2
> +LIBQMI_VERSION = 1.30.4
> LIBQMI_SITE = https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$(LIBQMI_VERSION)
> LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs)
> LIBQMI_LICENSE_FILES = COPYING COPYING.LIB
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-03-12 17:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-21 19:21 [Buildroot] [PATCH 1/1] package/libqmi: bump version to 1.30.4 Petr Vorel
2022-03-12 17:02 ` Arnout Vandecappelle
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.