Merge updates from master

This commit is contained in:
Repository mirror & CI
2024-06-06 15:05:55 +00:00
3 changed files with 22 additions and 21 deletions

View File

@@ -1,10 +1,23 @@
Partially backport 0f933eb5966848d96477b5148e40ac1c3e750e22 for distro-agnostic
detection of grub-btrfs snapshot functionality.
Author: Lucio Sauer <watermanpaint@posteo.net>
--- a/timeshift-autosnap
+++ b/timeshift-autosnap
@@ -53,7 +53,7 @@ if $(get_property "deleteSnapshots" "boolean" "true") ; then
@@ -53,8 +53,12 @@ if $(get_property "deleteSnapshots" "boolean" "true") ; then
fi
fi;
-if $(get_property "updateGrub" "boolean" "true") && [ "$(pacman -Qs ^grub-btrfs$)" ]; then
+if $(get_property "updateGrub" "boolean" "true") ; then
grub-mkconfig -o /boot/grub/grub.cfg
fi;
- grub-mkconfig -o /boot/grub/grub.cfg
-fi;
-
+if $(get_property "updateGrub" "boolean" "true") && [ -f /etc/grub.d/41_snapshots-btrfs ]; then
+ . /etc/default/grub-btrfs/config
+ if [ -s "${GRUB_BTRFS_GRUB_DIRNAME:-/boot/grub}/grub-btrfs.cfg" ]; then
+ /etc/grub.d/41_snapshots-btrfs
+ else
+ ${GRUB_BTRFS_MKCONFIG:-grub-mkconfig} -o ${GRUB_BTRFS_GRUB_DIRNAME:-/boot/grub}/grub.cfg
+ fi
+fi
exit 0

View File

@@ -1,9 +1,9 @@
# Copyright 2019-2021 Gentoo Authors
# Copyright 2019-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit readme.gentoo-r1
inherit optfeature readme.gentoo-r1
DESCRIPTION="Automatically creates a timeshift-snapshot when executed"
HOMEPAGE="https://gitlab.com/gobonja/timeshift-autosnap"
@@ -13,11 +13,7 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="
app-backup/timeshift
>=sys-apps/portage-2.1
"
RDEPEND="${DEPEND}"
RDEPEND="app-backup/timeshift"
PATCHES=( "${FILESDIR}/${PN}-remove-arch-specific.patch" )
@@ -27,15 +23,6 @@ $ touch /etc/portage/bashrc
$ grep -q "#!/bin/" /etc/portage/bashrc || awk -i inplace "BEGINFILE{print "#!/bin/sh"}{print}" /etc/portage/bashrc
$ grep -q timeshift-autosnap /etc/portage/bashrc || echo "function pre_pkg_setup() { /usr/bin/timeshift-autosnap ; }" >> /etc/portage/bashrc'
src_unpack() {
default
mv "${WORKDIR}"/timeshift-autosnap-${PV}* "${WORKDIR}"/timeshift-autosnap-${PV} || die
}
src_compile(){
:
}
src_install(){
dobin timeshift-autosnap
insinto /etc
@@ -45,4 +32,5 @@ src_install(){
pkg_postinst() {
readme.gentoo_print_elog
optfeature "grub-btrfs snapshot support" app-backup/grub-btrfs
}

View File

@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
else
SRC_URI="https://codeberg.org/dnkl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}"
KEYWORDS="~amd64 ~arm64"
KEYWORDS="~amd64 ~arm64 ~ppc64"
fi
DESCRIPTION="Simplistic and highly configurable status panel for X and Wayland"