From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F2048158020 for ; Sun, 20 Nov 2022 22:06:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1EA9FE0952; Sun, 20 Nov 2022 22:06:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 01F0CE0952 for ; Sun, 20 Nov 2022 22:06:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B960F340B9C for ; Sun, 20 Nov 2022 22:06:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1A673756 for ; Sun, 20 Nov 2022 22:06:42 +0000 (UTC) From: "Pascal Jäger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pascal Jäger" Message-ID: <1668981929.23d5db0932cd9243f5de54b75d31d3690ebbf20a.pascal.jaeger@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-backup/grub-btrfs/files/, app-backup/grub-btrfs/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-backup/grub-btrfs/files/grub-btrfs-9999-remove-docs-from-make.patch app-backup/grub-btrfs/grub-btrfs-9999.ebuild X-VCS-Directories: app-backup/grub-btrfs/files/ app-backup/grub-btrfs/ X-VCS-Committer: pascal.jaeger X-VCS-Committer-Name: Pascal Jäger X-VCS-Revision: 23d5db0932cd9243f5de54b75d31d3690ebbf20a X-VCS-Branch: dev Date: Sun, 20 Nov 2022 22:06:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 00b74d14-0ac5-4976-959c-f9085114150c X-Archives-Hash: ddd8aa34a5c54e5881e2627fd954dc16 commit: 23d5db0932cd9243f5de54b75d31d3690ebbf20a Author: Pascal Jäger leimstift de> AuthorDate: Sun Nov 20 22:05:29 2022 +0000 Commit: Pascal Jäger leimstift 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 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 (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] +}