mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-22 21:43:03 -04:00
Merge updates from master
This commit is contained in:
@@ -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
|
--- a/timeshift-autosnap
|
||||||
+++ b/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
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
-if $(get_property "updateGrub" "boolean" "true") && [ "$(pacman -Qs ^grub-btrfs$)" ]; then
|
-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
|
||||||
grub-mkconfig -o /boot/grub/grub.cfg
|
-fi;
|
||||||
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
|
||||||
|
|||||||
@@ -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
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI=8
|
EAPI=8
|
||||||
|
|
||||||
inherit readme.gentoo-r1
|
inherit optfeature readme.gentoo-r1
|
||||||
|
|
||||||
DESCRIPTION="Automatically creates a timeshift-snapshot when executed"
|
DESCRIPTION="Automatically creates a timeshift-snapshot when executed"
|
||||||
HOMEPAGE="https://gitlab.com/gobonja/timeshift-autosnap"
|
HOMEPAGE="https://gitlab.com/gobonja/timeshift-autosnap"
|
||||||
@@ -13,11 +13,7 @@ LICENSE="MIT"
|
|||||||
SLOT="0"
|
SLOT="0"
|
||||||
KEYWORDS="~amd64 ~x86"
|
KEYWORDS="~amd64 ~x86"
|
||||||
|
|
||||||
DEPEND="
|
RDEPEND="app-backup/timeshift"
|
||||||
app-backup/timeshift
|
|
||||||
>=sys-apps/portage-2.1
|
|
||||||
"
|
|
||||||
RDEPEND="${DEPEND}"
|
|
||||||
|
|
||||||
PATCHES=( "${FILESDIR}/${PN}-remove-arch-specific.patch" )
|
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 "#!/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'
|
$ 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(){
|
src_install(){
|
||||||
dobin timeshift-autosnap
|
dobin timeshift-autosnap
|
||||||
insinto /etc
|
insinto /etc
|
||||||
@@ -45,4 +32,5 @@ src_install(){
|
|||||||
|
|
||||||
pkg_postinst() {
|
pkg_postinst() {
|
||||||
readme.gentoo_print_elog
|
readme.gentoo_print_elog
|
||||||
|
optfeature "grub-btrfs snapshot support" app-backup/grub-btrfs
|
||||||
}
|
}
|
||||||
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
|
|||||||
else
|
else
|
||||||
SRC_URI="https://codeberg.org/dnkl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
SRC_URI="https://codeberg.org/dnkl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||||
S="${WORKDIR}/${PN}"
|
S="${WORKDIR}/${PN}"
|
||||||
KEYWORDS="~amd64 ~arm64"
|
KEYWORDS="~amd64 ~arm64 ~ppc64"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
DESCRIPTION="Simplistic and highly configurable status panel for X and Wayland"
|
DESCRIPTION="Simplistic and highly configurable status panel for X and Wayland"
|
||||||
|
|||||||
Reference in New Issue
Block a user