* [gentoo-commits] repo/proj/guru:dev commit in: app-backup/grub-btrfs/files/, app-backup/grub-btrfs/
@ 2021-10-07 20:53 Pascal Jäger
0 siblings, 0 replies; 3+ messages in thread
From: Pascal Jäger @ 2021-10-07 20:53 UTC (permalink / raw
To: gentoo-commits
commit: b91bab108d140898a527b16a4e0ee54636713428
Author: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Thu Oct 7 20:39:54 2021 +0000
Commit: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
CommitDate: Thu Oct 7 20:53:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b91bab10
app-backup/grub-btrfs: bump to new version 4.10.2, fixed 816684
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>
app-backup/grub-btrfs/Manifest | 2 +-
.../files/grub-btrfs-4.10.2-remove-docs-from-make.patch | 13 +++++++++++++
.../{grub-btrfs-4.10.1.ebuild => grub-btrfs-4.10.2.ebuild} | 8 ++++++++
3 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/app-backup/grub-btrfs/Manifest b/app-backup/grub-btrfs/Manifest
index 767ea459d..63e8b06f8 100644
--- a/app-backup/grub-btrfs/Manifest
+++ b/app-backup/grub-btrfs/Manifest
@@ -1 +1 @@
-DIST grub-btrfs-4.10.1.tar.gz 24581 BLAKE2B 10cba8c3e22ff44c347e331fc8e6f108a947e912db042aca5b61307f01058cef82d44033ce2e1fc36d926e178d2bdd397beac30a7adf89b811ebdba1fb12b112 SHA512 e9d395ad56e3095ca27a92f2ceedb699249ea14b29a351e3db13cf27aa8999a9de2bfdca565a5ed359744f88c0dc6f8919b32c8283c763f5facc7b01e98a08c5
+DIST grub-btrfs-4.10.2.tar.gz 25021 BLAKE2B d7fe9eed9a08b79e25a52f37bd86fcb30755bcaa567fc83707340e8d5163ba0959151b711576ccaf06327d38809034740b62dbd526cf49a14554ca6417ab59ae SHA512 26a565db2bacaf3a186f3d0d0827c8dc75204a0d96aeccda13e78f15f81ed1ec79bef8ce65fb63fa35808427ae700e39ada53349c6829d08f0a57e34d37c6b47
diff --git a/app-backup/grub-btrfs/files/grub-btrfs-4.10.2-remove-docs-from-make.patch b/app-backup/grub-btrfs/files/grub-btrfs-4.10.2-remove-docs-from-make.patch
new file mode 100644
index 000000000..e254040f9
--- /dev/null
+++ b/app-backup/grub-btrfs/files/grub-btrfs-4.10.2-remove-docs-from-make.patch
@@ -0,0 +1,13 @@
+--- a/Makefile
++++ b/Makefile
+@@ -23,8 +23,8 @@ install:
+ 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)/doc/$(PKGNAME)/" README.md
+- @install -Dm644 "initramfs/readme.md" "$(SHARE_DIR)/doc/$(PKGNAME)/initramfs-overlayfs.md"
++# @install -Dm644 -t "$(SHARE_DIR)/doc/$(PKGNAME)/" README.md
++# @install -Dm644 "initramfs/readme.md" "$(SHARE_DIR)/doc/$(PKGNAME)/initramfs-overlayfs.md"
+
+ uninstall:
+ @if test "$(shell id -u)" != 0; then \
diff --git a/app-backup/grub-btrfs/grub-btrfs-4.10.1.ebuild b/app-backup/grub-btrfs/grub-btrfs-4.10.2.ebuild
similarity index 76%
rename from app-backup/grub-btrfs/grub-btrfs-4.10.1.ebuild
rename to app-backup/grub-btrfs/grub-btrfs-4.10.2.ebuild
index 146919a6b..27c5d8136 100644
--- a/app-backup/grub-btrfs/grub-btrfs-4.10.1.ebuild
+++ b/app-backup/grub-btrfs/grub-btrfs-4.10.2.ebuild
@@ -11,6 +11,8 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
+PATCHES=( "${FILESDIR}/${P}-remove-docs-from-make.patch" )
+
DEPEND="
sys-fs/btrfs-progs
@@ -25,6 +27,12 @@ src_prepare() {
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."
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-backup/grub-btrfs/files/, app-backup/grub-btrfs/
@ 2022-08-15 20:16 Pascal Jäger
0 siblings, 0 replies; 3+ messages in thread
From: Pascal Jäger @ 2022-08-15 20:16 UTC (permalink / raw
To: gentoo-commits
commit: dcd8f8b56dc0c4bc4279326a5e3f766299eb3f47
Author: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Mon Aug 15 20:13:43 2022 +0000
Commit: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
CommitDate: Mon Aug 15 20:15:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dcd8f8b5
app-backup/grub-btrfs: add 4.11-r1, drop 4.10.2
Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>
app-backup/grub-btrfs/Manifest | 1 -
.../grub-btrfs-4.10.2-remove-docs-from-make.patch | 13 --------
app-backup/grub-btrfs/grub-btrfs-4.10.2.ebuild | 38 ----------------------
...btrfs-4.11.ebuild => grub-btrfs-4.11-r1.ebuild} | 12 +++++--
4 files changed, 9 insertions(+), 55 deletions(-)
diff --git a/app-backup/grub-btrfs/Manifest b/app-backup/grub-btrfs/Manifest
index 53daf08dd..1ab02333d 100644
--- a/app-backup/grub-btrfs/Manifest
+++ b/app-backup/grub-btrfs/Manifest
@@ -1,2 +1 @@
-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.10.2-remove-docs-from-make.patch b/app-backup/grub-btrfs/files/grub-btrfs-4.10.2-remove-docs-from-make.patch
deleted file mode 100644
index e254040f9..000000000
--- a/app-backup/grub-btrfs/files/grub-btrfs-4.10.2-remove-docs-from-make.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -23,8 +23,8 @@ install:
- 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)/doc/$(PKGNAME)/" README.md
-- @install -Dm644 "initramfs/readme.md" "$(SHARE_DIR)/doc/$(PKGNAME)/initramfs-overlayfs.md"
-+# @install -Dm644 -t "$(SHARE_DIR)/doc/$(PKGNAME)/" README.md
-+# @install -Dm644 "initramfs/readme.md" "$(SHARE_DIR)/doc/$(PKGNAME)/initramfs-overlayfs.md"
-
- uninstall:
- @if test "$(shell id -u)" != 0; then \
diff --git a/app-backup/grub-btrfs/grub-btrfs-4.10.2.ebuild b/app-backup/grub-btrfs/grub-btrfs-4.10.2.ebuild
deleted file mode 100644
index 157a980d7..000000000
--- a/app-backup/grub-btrfs/grub-btrfs-4.10.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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
-"
-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."
-}
diff --git a/app-backup/grub-btrfs/grub-btrfs-4.11.ebuild b/app-backup/grub-btrfs/grub-btrfs-4.11-r1.ebuild
similarity index 81%
rename from app-backup/grub-btrfs/grub-btrfs-4.11.ebuild
rename to app-backup/grub-btrfs/grub-btrfs-4.11-r1.ebuild
index 05ea2cc8c..4cd7963d0 100644
--- a/app-backup/grub-btrfs/grub-btrfs-4.11.ebuild
+++ b/app-backup/grub-btrfs/grub-btrfs-4.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Antynea/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="systemd"
PATCHES=( "${FILESDIR}/${P}-remove-docs-from-make.patch" )
DEPEND="
@@ -27,8 +27,14 @@ BDEPEND=""
src_compile(){
true
}
+
src_install(){
- default
+ local conf
+ if use systemd; then
+ conf+="SYSTEMD=true OPENRC=false"
+ else conf+="OPENRC=true SYSTEMD=false"
+ fi
+ emake DESTDIR="${D}" ${conf} install || die
dodoc README.md
mv ./initramfs/readme.md initramfs-overlayfs.md || die
dodoc initramfs-overlayfs.md
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-backup/grub-btrfs/files/, app-backup/grub-btrfs/
@ 2022-11-20 22:06 Pascal Jäger
0 siblings, 0 replies; 3+ messages in thread
From: Pascal Jäger @ 2022-11-20 22:06 UTC (permalink / raw
To: gentoo-commits
commit: 23d5db0932cd9243f5de54b75d31d3690ebbf20a
Author: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Sun Nov 20 22:05:29 2022 +0000
Commit: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
CommitDate: Sun Nov 20 22:05:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=23d5db09
app-backup/grub-btrfs: new live ebuild
Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>
.../grub-btrfs-9999-remove-docs-from-make.patch | 37 ++++++++++++++
app-backup/grub-btrfs/grub-btrfs-9999.ebuild | 58 ++++++++++++++++++++++
2 files changed, 95 insertions(+)
diff --git a/app-backup/grub-btrfs/files/grub-btrfs-9999-remove-docs-from-make.patch b/app-backup/grub-btrfs/files/grub-btrfs-9999-remove-docs-from-make.patch
new file mode 100644
index 000000000..098050404
--- /dev/null
+++ b/app-backup/grub-btrfs/files/grub-btrfs-9999-remove-docs-from-make.patch
@@ -0,0 +1,37 @@
+Upstreams Makefile installs docs into path that is against Gentoos conventions
+
+# Pascal Jäger <pascal.jaeger@leimstift.de> (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-9999.ebuild b/app-backup/grub-btrfs/grub-btrfs-9999.ebuild
new file mode 100644
index 000000000..f423222fc
--- /dev/null
+++ b/app-backup/grub-btrfs/grub-btrfs-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature
+
+DESCRIPTION="Improves Grub by adding btrfs snapshots to the Grub menu."
+HOMEPAGE="https://github.com/Antynea/grub-btrfs"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/Antynea/grub-btrfs"
+else
+ SRC_URI="https://github.com/Antynea/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="systemd"
+PATCHES=( "${FILESDIR}/${P}-remove-docs-from-make.patch" )
+
+DEPEND="
+ sys-fs/btrfs-progs
+ sys-boot/grub
+ virtual/awk
+ >=app-shells/bash-4
+ sys-fs/inotify-tools
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_compile(){
+ true
+}
+
+src_install(){
+ local conf
+ if use systemd; then
+ conf+="SYSTEMD=true OPENRC=false"
+ else
+ conf+="OPENRC=true SYSTEMD=false"
+ fi
+ emake DESTDIR="${D}" ${conf} install || die
+ dodoc README.md
+ mv ./initramfs/readme.md initramfs-overlayfs.md || die
+ dodoc initramfs-overlayfs.md
+ doman temp/grub-btrfs.8
+ doman temp/grub-btrfsd.8
+}
+
+pkg_postinst() {
+ elog "run 'grub-mkconfig -o /boot/grub/grub.cfg' to update your Grub menu."
+ elog "update the /etc/grub.d/41_snapshots-btrfs script if neccesary."
+ elog "(e.g. with dispatch-conf or etc-update)"
+ optfeature "LVM/ LUKS support" sys-boot/grub[device-mapper]
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-11-20 22:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-07 20:53 [gentoo-commits] repo/proj/guru:dev commit in: app-backup/grub-btrfs/files/, app-backup/grub-btrfs/ Pascal Jäger
-- strict thread matches above, loose matches on Subject: below --
2022-08-15 20:16 Pascal Jäger
2022-11-20 22:06 Pascal Jäger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox