calculate
/
calculate-overlay
6
1
Fork 2
Code Issues Pull Requests 2 Releases Wiki Activity

Merge pull request '[unsafe] fix a lot of warnings in eclass/sys-kernel' (#12) from ktrace/calculate-overlay:newdev into develop

Browse Source 
Reviewed-on: #12
pull/9/head
lautre 1 year ago
parent 5875e76f5c a7e7c734da
commit 1aa19e95ea
9 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File

36
eclass/calculate-kernel-8.eclass
Unescape View File

@ -15,15 +15,15 @@
# @DESCRIPTION:
# This eclass use for calculate-sources ebuild
inherit calculate eutils kernel-2
inherit calculate kernel-2
EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst
REQUIRED_USE="minimal? ( vmlinuz )"
CDEPEND="vmlinuz? ( || ( app-arch/xz-utils app-arch/lzma-utils )
grub? ( sys-boot/grub )
)
CDEPEND="
vmlinuz? ( app-arch/xz-utils )
grub? ( sys-boot/grub )
firmware? ( || ( sys-kernel/linux-firmware
sys-firmware/eth-firmware ) )
sys-apps/kmod[zstd]"
@ -63,7 +63,7 @@ calculate-kernel-8_pkg_setup() {
calculate-kernel-8_src_unpack() {
kernel-2_src_unpack
cd ${S}
cd "${S}"
local GENTOOARCH="${ARCH}"
unset ARCH
emake defconfig || die "kernel configure failed"
@ -80,7 +80,7 @@ vmlinuz_src_compile() {
# disable sandbox
local GENTOOARCH="${ARCH}"
unset ARCH
cd ${S}
cd "${S}"
vmlinuz_clean_localversion
emake olddefconfig || die "kernel configure failed"
emake && emake modules || die "kernel build failed"
@ -95,11 +95,11 @@ calculate-kernel-8_src_compile() {
vmlinuz_src_install() {
# dracut change this files in chroot of ramdisk
SANDBOX_WRITE="${SANDBOX_WRITE}:/run/blkid:/etc/ld.so.cache~:/etc/ld.so.cache:/etc/mtab"
cd ${S}
cd "${S}"
dodir /usr/share/${PN}/${PV}/boot
INSTALL_PATH=${D}/usr/share/${PN}/${PV}/boot emake install
INSTALL_MOD_PATH=${D} emake modules_install
/sbin/depmod -b ${D} ${KV_FULL}
/sbin/depmod -b "${D}" "${KV_FULL}"
cp /etc/dracut.conf dracut.conf
echo >>dracut.conf
@ -123,18 +123,18 @@ vmlinuz_src_install() {
else
RDARCH=""
fi
/usr/bin/dracut $RDARCH -c dracut.conf -k ${D}/lib/modules/${KV_FULL} \
/usr/bin/dracut "${RDARCH}" -c dracut.conf -k "${D}/lib/modules/${KV_FULL}" \
--kver ${KV_FULL} \
${D}/usr/share/${PN}/${PV}/boot/initramfs-${KV_FULL}
"${D}/usr/share/${PN}/${PV}/boot/initramfs-${KV_FULL}"
# move firmware to share, because /lib/firmware installation does collisions
rm dracut.conf
mv ${D}/lib/firmware ${D}/usr/share/${PN}/${PV}
insinto /usr/share/${PN}/${PV}/boot/
mv "${D}/lib/firmware" "${D}/usr/share/${PN}/${PV}"
insinto "/usr/share/${PN}/${PV}/boot/"
newins .config config-${KV_FULL}
# recreate symlink in /lib/modules because symlink point to tmp/portage after make install
rm ${D}/lib/modules/${KV_FULL}/build
rm ${D}/lib/modules/${KV_FULL}/source
rm "${D}/lib/modules/${KV_FULL}/build"
rm "${D}/lib/modules/${KV_FULL}/source"
dosym /usr/src/linux-${KV_FULL} \
"/lib/modules/${KV_FULL}/source" ||
die "cannot install source symlink"
@ -206,7 +206,7 @@ calculate-kernel-8_src_install() {
insinto /usr/share/${PN}/${PV}/boot
newins .config config-${KV_FULL}
fi
use vmlinuz && touch ${D}/usr/src/linux-${KV_FULL}/.calculate
use vmlinuz && touch "${D}/usr/src/linux-${KV_FULL}/.calculate"
}
vmlinuz_pkg_postinst() {
@ -216,8 +216,8 @@ vmlinuz_pkg_postinst() {
calculate_update_ver /boot initramfs ${KV_FULL} /usr/share/${PN}/${PV}/boot/initramfs-${KV_FULL} .img
calculate_update_ver /boot System.map ${KV_FULL} /usr/share/${PN}/${PV}/boot/System.map-${KV_FULL}
# install firmware into /
mkdir -p ${ROOT}/lib/firmware
cp -a ${ROOT}/usr/share/${PN}/${PV}/firmware/* ${ROOT}/lib/firmware/
mkdir -p "${ROOT}/lib/firmware"
cp -a "${ROOT}/usr/share/${PN}/${PV}/firmware/*" "${ROOT}/lib/firmware/"
calculate_update_depmod
calculate_update_modules
}
@ -226,7 +226,7 @@ calculate-kernel-8_pkg_postinst() {
kernel-2_pkg_postinst
KV_OUT_DIR=${ROOT}/usr/src/linux-${KV_FULL}
use vmlinuz && cp -p /usr/share/${PN}/${PV}/boot/System.map* ${KV_OUT_DIR}/System.map
use vmlinuz && cp -p "/usr/share/${PN}/${PV}/boot/System.map*" "${KV_OUT_DIR}/System.map"
if ! use minimal
then

12
eclass/calculate-utils-r15.eclass
Unescape View File

@ -20,7 +20,7 @@ EXPORTED_FUNCTIONS="src_compile src_install pkg_preinst"
CALCULATE_URI="https://mirror.calculate-linux.org/source/calculate3"
MIRROR_URI=
# @ECLASS-VARIABLE: CALCULATE_MODULES
# @ECLASS_VARIABLE: CALCULATE_MODULES
# @DESCRIPTION:
# Associative array module names and versions
# Example:
@ -28,7 +28,7 @@ MIRROR_URI=
# ["console-gui"]="3.2.3.4"
# )
# @ECLASS-VARIABLE: CALCULATE_MODULES_USE
# @ECLASS_VARIABLE: CALCULATE_MODULES_USE
# @DESCRIPTION:
# Associative array module names and use for IUSE
# Example:
@ -36,13 +36,13 @@ MIRROR_URI=
# ["console-gui"]=""
# )
# @ECLASS-VARIABLE: CALCULATE_TARBALL
# @ECLASS_VARIABLE: CALCULATE_TARBALL
# @DESCRIPTION:
# Associative array module names and tarball archive name
# Example:
# declare -A CALCULATE_TARBALL=( ["lib"]="calculate-lib-3.2.3-r1.tar.bz2" )
# @ECLASS-VARIABLE: UTILS_PV
# @ECLASS_VARIABLE: UTILS_PV
# @DESCRIPTION:
# Default version of all components
# Example:
@ -252,7 +252,7 @@ calculate-utils-r15_src_compile() {
else
S="${WORKDIR}/${MODULE_PN}-${MODULE_PV}"
fi
cd $S
cd "$S"
if [[ $MODULE_PN == "calculate-lib" ]]
then
sed -ri "/class VariableClVer/{N;N;N;N;s/value = \".*?\"/value = \"${PV}\"/;}" \
@ -278,7 +278,7 @@ calculate-utils-r15_src_install() {
else
S="${WORKDIR}/${MODULE_PN}-${MODULE_PV}"
fi
cd $S
cd "$S"
distutils-r1_src_install
done
}

14
eclass/calculate-utils-r16.eclass
Unescape View File

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
# @ECLASS: calculate-utils-r15.eclass
# @ECLASS: calculate-utils-r16.eclass
# @MAINTAINER:
# support@calculate.ru
# @AUTHOR:
@ -20,7 +20,7 @@ EXPORTED_FUNCTIONS="src_compile src_install pkg_preinst"
CALCULATE_URI="https://mirror.calculate-linux.org/source/calculate3"
MIRROR_URI=
# @ECLASS-VARIABLE: CALCULATE_MODULES
# @ECLASS_VARIABLE: CALCULATE_MODULES
# @DESCRIPTION:
# Associative array module names and versions
# Example:
@ -28,7 +28,7 @@ MIRROR_URI=
# ["console-gui"]="3.2.3.4"
# )
# @ECLASS-VARIABLE: CALCULATE_MODULES_USE
# @ECLASS_VARIABLE: CALCULATE_MODULES_USE
# @DESCRIPTION:
# Associative array module names and use for IUSE
# Example:
@ -36,13 +36,13 @@ MIRROR_URI=
# ["console-gui"]=""
# )
# @ECLASS-VARIABLE: CALCULATE_TARBALL
# @ECLASS_VARIABLE: CALCULATE_TARBALL
# @DESCRIPTION:
# Associative array module names and tarball archive name
# Example:
# declare -A CALCULATE_TARBALL=( ["lib"]="calculate-lib-3.2.3-r1.tar.bz2" )
# @ECLASS-VARIABLE: UTILS_PV
# @ECLASS_VARIABLE: UTILS_PV
# @DESCRIPTION:
# Default version of all components
# Example:
@ -253,7 +253,7 @@ calculate-utils-r16_src_compile() {
else
S="${WORKDIR}/${MODULE_PN}-${MODULE_PV}"
fi
cd $S
cd "$S"
if [[ $MODULE_PN == "calculate-lib" ]]
then
sed -ri "/class VariableClVer/{N;N;N;N;s/value = \".*?\"/value = \"${PV}\"/;}" \
@ -279,7 +279,7 @@ calculate-utils-r16_src_install() {
else
S="${WORKDIR}/${MODULE_PN}-${MODULE_PV}"
fi
cd $S
cd "$S"
distutils-r1_src_install
done
}

26
eclass/calculate.eclass
Unescape View File

@ -11,7 +11,7 @@
# @DESCRIPTION:
# This eclass use for calculate-utils and calculate-sources ebuilds
inherit eutils linux-info
inherit linux-info
EXPORT_FUNCTIONS pkg_postinst
@ -95,7 +95,7 @@ update_file() {
# @DESCRIPTION:
# Detect calculate linux shortname by /etc/make.profile
detect_linux_shortname() {
local makeprofile=$(readlink ${ROOT}/etc/make.profile)
local makeprofile=$(readlink "${ROOT}/etc/make.profile")
local profile=
local system=
local shortname=
@ -137,8 +137,8 @@ calculate_update_kernel() {
ebegin "Trying to optimize initramfs"
( which calculate &>/dev/null && calculate --initrd ) && eend 0 || eend 1
if [[ "$(md5sum ${ROOT}/boot/initrd | awk '{print $1}')" == \
"$(md5sum ${ROOT}/boot/initrd-install | awk '{print $1}')" ]]
if [[ "$(md5sum "${ROOT}/boot/initrd" | awk '{print $1}')" == \
"$(md5sum "${ROOT}/boot/initrd-install" | awk '{print $1}')" ]]
then
ewarn
ewarn "Perform command after reboot for optimization initramfs:"
@ -221,18 +221,18 @@ initramfs_change_spalsh() {
then
# get silentpic param
SILENTPIC=$( sed -nr '/^silentpic/ s/^[^=]+=(.*)$/\1/p' \
${ROOT}${SPLASH_DESCRIPTOR} )
"${ROOT}${SPLASH_DESCRIPTOR}" )
# get pic param
PIC=$( sed -nr '/^pic/ s/^[^=]+=(.*)$/\1/p' \
${ROOT}${SPLASH_DESCRIPTOR} )
"${ROOT}${SPLASH_DESCRIPTOR}" )
if [ -f ${ROOT}${SILENTPIC} ] && [ -f ${ROOT}${PIC} ]
then
cp ${ROOT}${SPLASH_DESCRIPTOR} \
${TMP_INITRAMFS}${SPLASH_DESCRIPTOR} &&
cp "${ROOT}${SPLASH_DESCRIPTOR}" \
"${TMP_INITRAMFS}${SPLASH_DESCRIPTOR}" &&
mkdir -p ${TMP_INITRAMFS}${SILENTPIC%$(basename $SILENTPIC)} &&
cp ${ROOT}${SILENTPIC} ${TMP_INITRAMFS}${SILENTPIC} &&
cp "${ROOT}${SILENTPIC}" "${TMP_INITRAMFS}${SILENTPIC}" &&
mkdir -p ${TMP_INITRAMFS}${PIC%$(basename $PIC)} &&
cp ${ROOT}$PIC ${TMP_INITRAMFS}${PIC}
cp "${ROOT}$PIC" "${TMP_INITRAMFS}${PIC}"
return $?
fi
else
@ -387,7 +387,7 @@ ROOTDEV=
# @DESCRIPTION:
# Change version in /etc/issue
change_issue() {
sed -ri "s/${LINUXVER}/${PV}/" ${ROOT}/etc/issue
sed -ri "s/${LINUXVER}/${PV}/" "${ROOT}/etc/issue"
}
# @FUNCTION: change_grub
@ -499,10 +499,10 @@ calculate_pkg_postinst() {
local initrdfile=$(calculate_get_current_initrd )
local initrdinstallfile=$(calculate_get_current_initrd -install)
[[ -f ${ROOT}${initrdfile} ]] &&
calculate_update_splash ${ROOT}${initrdfile}
calculate_update_splash "${ROOT}${initrdfile}"
[[ -f ${ROOT}${initrdinstallfile} &&
"${ROOT}${initrdinstallfile}" != "${ROOT}${initrdfile}" ]] &&
calculate_update_splash ${ROOT}${initrdinstallfile}
calculate_update_splash "${ROOT}${initrdinstallfile}"
;;
esac
}

2
sys-kernel/calculate-sources/calculate-sources-5.10.103.ebuild
Unescape View File

@ -5,7 +5,7 @@
EAPI=7
ETYPE="sources"
inherit calculate-kernel-8 eutils
inherit calculate-kernel-8
DESCRIPTION="Calculate Linux kernel image"
KEYWORDS="amd64"

2
sys-kernel/calculate-sources/calculate-sources-5.10.161.ebuild
Unescape View File

@ -5,7 +5,7 @@
EAPI=7
ETYPE="sources"
inherit calculate-kernel-8 eutils
inherit calculate-kernel-8
DESCRIPTION="Calculate Linux kernel image"
KEYWORDS="~amd64"

2
sys-kernel/calculate-sources/calculate-sources-5.15.82.ebuild
Unescape View File

@ -5,7 +5,7 @@
EAPI=7
ETYPE="sources"
inherit calculate-kernel-8 eutils
inherit calculate-kernel-8
DESCRIPTION="Calculate Linux kernel image"
KEYWORDS="amd64"

2
sys-kernel/calculate-sources/calculate-sources-5.15.85.ebuild
Unescape View File

@ -5,7 +5,7 @@
EAPI=7
ETYPE="sources"
inherit calculate-kernel-8 eutils
inherit calculate-kernel-8
DESCRIPTION="Calculate Linux kernel image"
KEYWORDS="~amd64"

2
sys-kernel/calculate-sources/calculate-sources-6.0.15.ebuild
Unescape View File

@ -5,7 +5,7 @@
EAPI=7
ETYPE="sources"
inherit calculate-kernel-8 eutils
inherit calculate-kernel-8
DESCRIPTION="Calculate Linux kernel image"
KEYWORDS="~amd64"

Write Preview
Loading…
Cancel
Save