diff options
| author | Markus Volk <f_l_k@t-online.de> | 2026-02-18 17:17:49 +0100 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2026-02-20 23:34:18 -0800 |
| commit | d3a8ddcaaab2ef9f01d7f9285e1692450b709f0f (patch) | |
| tree | ac18fb1497c0e448b673a5d0e74b347ffe1c1aa4 | |
| parent | 87a9e44a8d8771825600bede4cad80d3b9a80e90 (diff) | |
| download | meta-openembedded-d3a8ddcaaab2ef9f01d7f9285e1692450b709f0f.tar.gz | |
snapper: update 0.12.2 -> 0.13.0
- Remove 0001-Fix-build-with-boost-1.89.patch. Seems to be fixed
upstream
- Use manpages class
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/snapper/snapper/0001-Fix-build-with-boost-1.89.patch | 89 | ||||
| -rw-r--r-- | meta-oe/recipes-support/snapper/snapper_0.13.0.bb (renamed from meta-oe/recipes-support/snapper/snapper_0.12.2.bb) | 12 |
2 files changed, 5 insertions, 96 deletions
diff --git a/meta-oe/recipes-support/snapper/snapper/0001-Fix-build-with-boost-1.89.patch b/meta-oe/recipes-support/snapper/snapper/0001-Fix-build-with-boost-1.89.patch deleted file mode 100644 index a6598b5635..0000000000 --- a/meta-oe/recipes-support/snapper/snapper/0001-Fix-build-with-boost-1.89.patch +++ /dev/null | |||
| @@ -1,89 +0,0 @@ | |||
| 1 | From c33e7707da86a23c4ad7e2451ddb04df419d6412 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sun, 31 Aug 2025 00:13:07 -0700 | ||
| 4 | Subject: [PATCH] Fix build with boost 1.89 | ||
| 5 | |||
| 6 | boost 1.89+ does not have boost system lib anymore all needed functions | ||
| 7 | are now in header | ||
| 8 | |||
| 9 | Upstream-Status: Pending | ||
| 10 | |||
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 12 | --- | ||
| 13 | dbus/Makefile.am | 2 +- | ||
| 14 | examples/c++-lib/Makefile.am | 1 - | ||
| 15 | server/Makefile.am | 2 +- | ||
| 16 | snapper/Makefile.am | 2 +- | ||
| 17 | testsuite-cmp/Makefile.am | 1 - | ||
| 18 | zypp-plugin/Makefile.am | 1 - | ||
| 19 | 6 files changed, 3 insertions(+), 6 deletions(-) | ||
| 20 | |||
| 21 | diff --git a/dbus/Makefile.am b/dbus/Makefile.am | ||
| 22 | index 9c0456a..2078d7d 100644 | ||
| 23 | --- a/dbus/Makefile.am | ||
| 24 | +++ b/dbus/Makefile.am | ||
| 25 | @@ -15,4 +15,4 @@ libdbus_la_SOURCES = \ | ||
| 26 | DBusMainLoop.cc DBusMainLoop.h | ||
| 27 | |||
| 28 | libdbus_la_LIBADD = $(DBUS_LIBS) | ||
| 29 | -libdbus_la_LDFLAGS = -lboost_system -lboost_thread | ||
| 30 | +libdbus_la_LDFLAGS = -lboost_thread | ||
| 31 | diff --git a/examples/c++-lib/Makefile.am b/examples/c++-lib/Makefile.am | ||
| 32 | index 52c81e5..f55da6f 100644 | ||
| 33 | --- a/examples/c++-lib/Makefile.am | ||
| 34 | +++ b/examples/c++-lib/Makefile.am | ||
| 35 | @@ -5,7 +5,6 @@ | ||
| 36 | AM_CPPFLAGS = -I$(top_srcdir) | ||
| 37 | |||
| 38 | LDADD = ../../snapper/libsnapper.la | ||
| 39 | -AM_LDFLAGS = -lboost_system | ||
| 40 | |||
| 41 | noinst_PROGRAMS = List ListAll Create CmpDirs CreateNumber CreateTimeline | ||
| 42 | |||
| 43 | diff --git a/server/Makefile.am b/server/Makefile.am | ||
| 44 | index c03f373..1aef916 100644 | ||
| 45 | --- a/server/Makefile.am | ||
| 46 | +++ b/server/Makefile.am | ||
| 47 | @@ -16,4 +16,4 @@ snapperd_SOURCES = \ | ||
| 48 | FilesTransferTask.cc FilesTransferTask.h | ||
| 49 | |||
| 50 | snapperd_LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lrt | ||
| 51 | -snapperd_LDFLAGS = -lboost_system -lboost_thread -lpthread | ||
| 52 | +snapperd_LDFLAGS = -lboost_thread -lpthread | ||
| 53 | diff --git a/snapper/Makefile.am b/snapper/Makefile.am | ||
| 54 | index b0fe55c..d75599f 100644 | ||
| 55 | --- a/snapper/Makefile.am | ||
| 56 | +++ b/snapper/Makefile.am | ||
| 57 | @@ -71,7 +71,7 @@ endif | ||
| 58 | |||
| 59 | libsnapper_la_CPPFLAGS = $(XML2_CFLAGS) $(ZLIB_CFLAGS) | ||
| 60 | libsnapper_la_LDFLAGS = -version-info @LIBVERSION_INFO@ | ||
| 61 | -libsnapper_la_LIBADD = -lboost_thread -lboost_system $(XML2_LIBS) -lacl $(ZLIB_LIBS) | ||
| 62 | +libsnapper_la_LIBADD = -lboost_thread $(XML2_LIBS) -lacl $(ZLIB_LIBS) | ||
| 63 | if ENABLE_ROLLBACK | ||
| 64 | libsnapper_la_LIBADD += -lmount | ||
| 65 | endif | ||
| 66 | diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am | ||
| 67 | index 81104bf..555bc3b 100644 | ||
| 68 | --- a/testsuite-cmp/Makefile.am | ||
| 69 | +++ b/testsuite-cmp/Makefile.am | ||
| 70 | @@ -3,7 +3,6 @@ | ||
| 71 | # | ||
| 72 | |||
| 73 | AM_CPPFLAGS = -I$(top_srcdir) | ||
| 74 | -AM_LDFLAGS = -lboost_system | ||
| 75 | |||
| 76 | LDADD = ../snapper/libsnapper.la | ||
| 77 | |||
| 78 | diff --git a/zypp-plugin/Makefile.am b/zypp-plugin/Makefile.am | ||
| 79 | index 9d102e0..e395f59 100644 | ||
| 80 | --- a/zypp-plugin/Makefile.am | ||
| 81 | +++ b/zypp-plugin/Makefile.am | ||
| 82 | @@ -33,7 +33,6 @@ forwarding_zypp_plugin_SOURCES = \ | ||
| 83 | forwarding_zypp_plugin_LDADD = \ | ||
| 84 | ../snapper/libsnapper.la \ | ||
| 85 | ../stomp/libstomp.la \ | ||
| 86 | - -lboost_system \ | ||
| 87 | -lpthread | ||
| 88 | |||
| 89 | TESTS = solvable-matcher.test | ||
diff --git a/meta-oe/recipes-support/snapper/snapper_0.12.2.bb b/meta-oe/recipes-support/snapper/snapper_0.13.0.bb index 981ca84c13..56d4c89d0f 100644 --- a/meta-oe/recipes-support/snapper/snapper_0.12.2.bb +++ b/meta-oe/recipes-support/snapper/snapper_0.13.0.bb | |||
| @@ -6,19 +6,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | |||
| 6 | DEPENDS = "acl boost btrfs-tools dbus e2fsprogs json-c libxml2 lvm2 ncurses zlib" | 6 | DEPENDS = "acl boost btrfs-tools dbus e2fsprogs json-c libxml2 lvm2 ncurses zlib" |
| 7 | 7 | ||
| 8 | # Build separation is slightly broken | 8 | # Build separation is slightly broken |
| 9 | inherit autotools-brokensep pkgconfig gettext | 9 | inherit autotools-brokensep pkgconfig gettext manpages |
| 10 | 10 | ||
| 11 | SRC_URI = "git://github.com/openSUSE/snapper.git;protocol=https;branch=master \ | 11 | SRC_URI = "git://github.com/openSUSE/snapper.git;protocol=https;branch=master" |
| 12 | file://0001-Fix-build-with-boost-1.89.patch \ | 12 | SRCREV = "3a3bd97083976d28538d402284ff947b4aab5b8f" |
| 13 | " | ||
| 14 | SRCREV = "4f3d2b2fc58aefa976668cd25b8eac02ba0f85e7" | ||
| 15 | 13 | ||
| 16 | EXTRA_OECONF += "--disable-zypp" | 14 | EXTRA_OECONF += "--disable-zypp" |
| 17 | 15 | ||
| 18 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'api-documentation systemd pam', d)}" | 16 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd pam', d)}" |
| 19 | PACKAGECONFIG[pam] = "--enable-pam --with-pam-security=${base_libdir}/security, --disable-pam,libpam" | 17 | PACKAGECONFIG[pam] = "--enable-pam --with-pam-security=${base_libdir}/security, --disable-pam,libpam" |
| 20 | PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd" | 18 | PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd" |
| 21 | PACKAGECONFIG[api-documentation] = "--enable-doc,--disable-doc,libxslt-native docbook-xsl-stylesheets-native" | 19 | PACKAGECONFIG[manpages] = "--enable-doc,--disable-doc,libxslt-native docbook-xsl-stylesheets-native" |
| 22 | 20 | ||
| 23 | # Avoid HOSTTOOLS path in binaries | 21 | # Avoid HOSTTOOLS path in binaries |
| 24 | export DIFF_BIN = "${bindir}/diff" | 22 | export DIFF_BIN = "${bindir}/diff" |
