[gentoo-commits] repo/proj/guru:dev commit in: app-backup/grub-btrfs/, app-backup/grub-btrfs/files/
commit: 0fd47e52392025b0416e81851ba176767c6cc04c
Author: Pascal Jäger leimstift de>
AuthorDate: Sun Mar 26 19:52:57 2023 +
Commit: Pascal Jäger leimstift de>
CommitDate: Sun Mar 26 19:52:57 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0fd47e52
app-backup/grub-btrfs: drop patch for live version
Signed-off-by: Pascal Jäger leimstift.de>
.../grub-btrfs--remove-docs-from-make.patch| 37 --
app-backup/grub-btrfs/grub-btrfs-.ebuild | 7 ++--
2 files changed, 3 insertions(+), 41 deletions(-)
diff --git
a/app-backup/grub-btrfs/files/grub-btrfs--remove-docs-from-make.patch
b/app-backup/grub-btrfs/files/grub-btrfs--remove-docs-from-make.patch
deleted file mode 100644
index 098050404..0
--- a/app-backup/grub-btrfs/files/grub-btrfs--remove-docs-from-make.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Upstreams Makefile installs docs into path that is against Gentoos conventions
-
-# Pascal Jäger (2022-11-20)
-
a/Makefile
-+++ b/Makefile
-@@ -34,11 +34,11 @@
- @mkdir "${TEMP_DIR}"
- @chmod 777 ${TEMP_DIR}
- @cp manpages/grub-btrfs.8.man ${TEMP_DIR}/grub-btrfs.8
-- @bzip2 ${TEMP_DIR}/grub-btrfs.8
-- @install -Dm644 -t "${MAN_DIR}/man8" "${TEMP_DIR}/grub-btrfs.8.bz2"
-+# @bzip2 ${TEMP_DIR}/grub-btrfs.8
-+# @install -Dm644 -t "${MAN_DIR}/man8" "${TEMP_DIR}/grub-btrfs.8.bz2"
- @cp manpages/grub-btrfsd.8.man ${TEMP_DIR}/grub-btrfsd.8
-- @bzip2 ${TEMP_DIR}/grub-btrfsd.8
-- @install -Dm644 -t "${MAN_DIR}/man8" "${TEMP_DIR}/grub-btrfsd.8.bz2";
-+# @bzip2 ${TEMP_DIR}/grub-btrfsd.8
-+# @install -Dm644 -t "${MAN_DIR}/man8" "${TEMP_DIR}/grub-btrfsd.8.bz2";
- @install -Dm755 -t "$(DESTDIR)/etc/grub.d/" 41_snapshots-btrfs
- @install -Dm644 -t "$(DESTDIR)/etc/default/grub-btrfs/" config
- @install -Dm744 -t "$(BIN_DIR)/" grub-btrfsd;
-@@ -59,10 +59,10 @@
- install -Dm644 "initramfs/Arch Linux/overlay_snap_ro-install"
"$(LIB_DIR)/initcpio/install/grub-btrfs-overlayfs"; \
- install -Dm644 "initramfs/Arch Linux/overlay_snap_ro-hook"
"$(LIB_DIR)/initcpio/hooks/grub-btrfs-overlayfs"; \
-fi
-- @install -Dm644 -t "$(SHARE_DIR)/licenses/$(PKGNAME)/" LICENSE
-- @install -Dm644 -t "$(SHARE_DIR)/doc/$(PKGNAME)/" README.md
-- @install -Dm644 "initramfs/readme.md"
"$(SHARE_DIR)/doc/$(PKGNAME)/initramfs-overlayfs.md"
-- @rm -rf "${TEMP_DIR}"
-+# @install -Dm644 -t "$(SHARE_DIR)/licenses/$(PKGNAME)/" LICENSE
-+# @install -Dm644 -t "$(SHARE_DIR)/doc/$(PKGNAME)/" README.md
-+# @install -Dm644 "initramfs/readme.md"
"$(SHARE_DIR)/doc/$(PKGNAME)/initramfs-overlayfs.md"
-+# @rm -rf "${TEMP_DIR}"
-
- uninstall:
- @echo "Uninstalling grub-btrfs"
diff --git a/app-backup/grub-btrfs/grub-btrfs-.ebuild
b/app-backup/grub-btrfs/grub-btrfs-.ebuild
index e51466340..451771277 100644
--- a/app-backup/grub-btrfs/grub-btrfs-.ebuild
+++ b/app-backup/grub-btrfs/grub-btrfs-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -19,7 +19,6 @@ fi
LICENSE="GPL-3"
SLOT="0"
IUSE="systemd"
-PATCHES=( "${FILESDIR}/${PN}--remove-docs-from-make.patch" )
DEPEND="
sys-fs/btrfs-progs
@@ -38,9 +37,9 @@ src_compile(){
src_install(){
local conf
if use systemd; then
- conf+="SYSTEMD=true OPENRC=false"
+ conf+="GRUB_UPDATE_EXCLUDE=true INSTALL_DOCS=false SYSTEMD=true
OPENRC=false"
else
- conf+="OPENRC=true SYSTEMD=false"
+ conf+="GRUB_UPDATE_EXCLUDE=true INSTALL_DOCS=false OPENRC=true
SYSTEMD=false"
fi
emake DESTDIR="${D}" ${conf} install || die
dodoc README.md
[gentoo-commits] repo/proj/guru:dev commit in: app-backup/grub-btrfs/, app-backup/grub-btrfs/files/
commit: 2f6b982f77bcbee4943043af051ca722a9ac875a
Author: Pascal Jäger leimstift de>
AuthorDate: Fri Apr 15 13:37:23 2022 +
Commit: Pascal Jäger leimstift de>
CommitDate: Fri Apr 15 13:37:57 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2f6b982f
app-backup/grub-btrfs: add 4.11
Signed-off-by: Pascal Jäger leimstift.de>
app-backup/grub-btrfs/Manifest | 1 +
.../grub-btrfs-4.11-remove-docs-from-make.patch| 16 +
app-backup/grub-btrfs/grub-btrfs-4.11.ebuild | 41 ++
3 files changed, 58 insertions(+)
diff --git a/app-backup/grub-btrfs/Manifest b/app-backup/grub-btrfs/Manifest
index 63e8b06f8..53daf08dd 100644
--- a/app-backup/grub-btrfs/Manifest
+++ b/app-backup/grub-btrfs/Manifest
@@ -1 +1,2 @@
DIST grub-btrfs-4.10.2.tar.gz 25021 BLAKE2B
d7fe9eed9a08b79e25a52f37bd86fcb30755bcaa567fc83707340e8d5163ba0959151b711576ccaf06327d38809034740b62dbd526cf49a14554ca6417ab59ae
SHA512
26a565db2bacaf3a186f3d0d0827c8dc75204a0d96aeccda13e78f15f81ed1ec79bef8ce65fb63fa35808427ae700e39ada53349c6829d08f0a57e34d37c6b47
+DIST grub-btrfs-4.11.tar.gz 26016 BLAKE2B
f808293e7ea06bf10b4a3fa46c7f70aae5b84fab46eae3f0b964e17c0b0e9cb0d2f60995177d33712e4f24b9d3e45aa6fd7ec514be4acb75f00f76d4c5380c3a
SHA512
c72cc6cad73e4dfa5d16345d845b2327ec854eb7c49d72f2c8d332c1854937fb1a102833b80517ee17289715f41e9b6a6342e49d4cea88325d13159dc08dcf42
diff --git
a/app-backup/grub-btrfs/files/grub-btrfs-4.11-remove-docs-from-make.patch
b/app-backup/grub-btrfs/files/grub-btrfs-4.11-remove-docs-from-make.patch
new file mode 100644
index 0..127501b0b
--- /dev/null
+++ b/app-backup/grub-btrfs/files/grub-btrfs-4.11-remove-docs-from-make.patch
@@ -0,0 +1,16 @@
+--- a/Makefile
b/Makefile
+
+36,38c36,38
+< @install -Dm644 -t "$(SHARE_DIR)/licenses/$(PKGNAME)/" LICENSE
+< @install -Dm644 -t "$(SHARE_DIR)/doc/$(PKGNAME)/" README.md
+< @install -Dm644 "initramfs/readme.md"
"$(SHARE_DIR)/doc/$(PKGNAME)/initramfs-overlayfs.md"
+---
+> #@install -Dm644 -t "$(SHARE_DIR)/licenses/$(PKGNAME)/" LICENSE
+> #@install -Dm644 -t "$(SHARE_DIR)/doc/$(PKGNAME)/" README.md
+> #@install -Dm644 "initramfs/readme.md"
"$(SHARE_DIR)/doc/$(PKGNAME)/initramfs-overlayfs.md"
+86c86
+< @echo
+\ No newline at end of file
+---
+> @echo
diff --git a/app-backup/grub-btrfs/grub-btrfs-4.11.ebuild
b/app-backup/grub-btrfs/grub-btrfs-4.11.ebuild
new file mode 100644
index 0..cd3f71ad1
--- /dev/null
+++ b/app-backup/grub-btrfs/grub-btrfs-4.11.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Improves Grub by adding btrfs snapshots to the Grub menu."
+HOMEPAGE="https://github.com/Antynea/grub-btrfs;
+SRC_URI="https://github.com/Antynea/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+PATCHES=( "${FILESDIR}/${P}-remove-docs-from-make.patch" )
+
+DEPEND="
+ sys-fs/btrfs-progs
+ sys-boot/grub
+virtual/awk
+>=app-shells/bash-4
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_prepare() {
+ default
+}
+src_compile(){
+ true
+}
+src_install(){
+ default
+ dodoc README.md
+ mv ./initramfs/readme.md initramfs-overlayfs.md
+ dodoc initramfs-overlayfs.md
+}
+
+pkg_postinst() {
+ elog "run 'grub-mkconfig -o /boot/grub/grub.cfg' to update your Grub
menu."
+elog "update your /etc/grub.d/41_snapshots-btrfs script (e.g. with
dispatch-conf or etc-update)"
+}
