Merge pull request 'sys-boot/*, sys-firmware/*: improvements' (#107) from kuraga/calculate-overlay:improvements-3 into develop

Reviewed-on: #107
This commit is contained in:
egoncharov 2024-10-16 16:06:44 +03:00
commit 9d15112f73
7 changed files with 71 additions and 24 deletions

View file

@ -27,7 +27,7 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="debug +drm +gtk +pango +split-usr static-libs +udev"
CDEPEND="
COMMON_DEPEND="
>=media-libs/libpng-1.2.16:=
drm? ( x11-libs/libdrm )
gtk? (
@ -37,14 +37,14 @@ CDEPEND="
)
pango? ( >=x11-libs/pango-1.21 )
"
DEPEND="${CDEPEND}
DEPEND="${COMMON_DEPEND}
elibc_musl? ( sys-libs/rpmatch-standalone )
app-text/docbook-xsl-stylesheets
dev-libs/libxslt
virtual/pkgconfig
"
# Block due bug #383067
RDEPEND="${CDEPEND}
RDEPEND="${COMMON_DEPEND}
udev? ( virtual/udev )
sys-kernel/dracut
"

View file

@ -6,5 +6,13 @@
<name>Mir Calculate</name>
<description>Calculate Overlay</description>
</maintainer>
<upstream><remote-id type="github">Kangie/plymouth-openrc-plugin</remote-id></upstream>
<longdescription lang="en">
Plymouth plugin for OpenRC.
</longdescription>
<longdescription lang="ru">
Plymouth-плагин для OpenRC.
</longdescription>
<upstream>
<remote-id type="github">Kangie/plymouth-openrc-plugin</remote-id>
</upstream>
</pkgmetadata>

View file

@ -9,16 +9,18 @@ SRC_URI="https://github.com/Kangie/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86"
KEYWORDS="amd64"
DEPEND="sys-apps/openrc:="
RDEPEND="${DEPEND}
sys-boot/plymouth
!sys-apps/systemd"
PATCHES=( "${FILESDIR}/${P}-disable-messages.patch"
"${FILESDIR}/${P}-restart-consolefont.patch"
"${FILESDIR}/${P}-silent-shutdown.patch" )
PATCHES=(
"${FILESDIR}"/${P}-disable-messages.patch
"${FILESDIR}"/${P}-restart-consolefont.patch
"${FILESDIR}"/${P}-silent-shutdown.patch
)
src_install() {
insinto /$(get_libdir)/rc/plugins

View file

@ -9,14 +9,16 @@ SRC_URI="https://github.com/Kangie/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86"
KEYWORDS="amd64"
DEPEND="sys-apps/openrc:="
RDEPEND="${DEPEND}
sys-boot/plymouth
!sys-apps/systemd"
PATCHES=( "${FILESDIR}/${P}-r2.patch" )
PATCHES=(
"${FILESDIR}"/${P}-r2.patch
)
src_install() {
insinto /$(get_libdir)/rc/plugins

View file

@ -0,0 +1,35 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# NOTE: This is the modification of `sys-boot/plymouth-openrc-plugin-0.1.3::gentoo` patched for Calculate
EAPI=7
DESCRIPTION="Plymouth plugin for OpenRC"
HOMEPAGE="https://github.com/Kangie/plymouth-openrc-plugin"
SRC_URI="https://github.com/Kangie/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64"
DEPEND="sys-apps/openrc"
RDEPEND="${DEPEND}
sys-boot/plymouth
!sys-apps/systemd"
PATCHES=(
"${FILESDIR}"/${P}-r2.patch
)
src_install() {
insinto /$(get_libdir)/rc/plugins
doins plymouth.so
}
pkg_postinst() {
if [[ -z ${REPLACING_VERSIONS} ]]; then
ewarn "You need to disable 'rc_interactive' feature in /etc/rc.conf to make"
ewarn "Plymouth work properly with OpenRC init system."
fi
}

View file

@ -1,29 +1,29 @@
# Copyright 1999-2024 Gentoo Authors
# Copyright 2007-2024 Mir Calculate
# Distributed under the terms of the GNU General Public License v2
EAPI=8
MYPN=linux-firmware
MYP=linux-firmware-${PV}
MY_PN=linux-firmware
MY_P=linux-firmware-${PV}
GIT_COMMIT="1cb4e51018293c14642f115b5868cda92b879161"
DESCRIPTION="Binary firmware for Realtek Ethernet"
HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${MYP}.tar.gz"
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+ freedist"
SLOT="0"
KEYWORDS="amd64"
RESTRICT="binchecks strip"
RDEPEND="!sys-kernel/linux-firmware"
RESTRICT="binchecks strip"
src_unpack() {
default
# rename directory from git snapshot tarball
mv ${MYPN}-*/ ${P} || die
mv ${MY_PN}-*/ ${P} || die
}
src_install() {

View file

@ -1,29 +1,29 @@
# Copyright 1999-2024 Gentoo Authors
# Copyright 2007-2024 Mir Calculate
# Distributed under the terms of the GNU General Public License v2
EAPI=8
MYPN=linux-firmware
MYP=linux-firmware-${PV}
MY_PN=linux-firmware
MY_P=linux-firmware-${PV}
GIT_COMMIT="e068ccf01a2afc2d9c689f5d3b0cb715cc1d4824"
DESCRIPTION="Binary firmware for Realtek Ethernet"
HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${MYP}.tar.gz"
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+ freedist"
SLOT="0"
KEYWORDS="amd64"
RESTRICT="binchecks strip"
RDEPEND="!sys-kernel/linux-firmware"
RESTRICT="binchecks strip"
src_unpack() {
default
# rename directory from git snapshot tarball
mv ${MYPN}-*/ ${P} || die
mv ${MY_PN}-*/ ${P} || die
}
src_install() {