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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 050A0138359 for ; Wed, 21 Oct 2020 00:24:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 500F7E0A65; Wed, 21 Oct 2020 00:24:20 +0000 (UTC) Received: from mail-pj1-f65.google.com (mail-pj1-f65.google.com [209.85.216.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3F7ACE0A65 for ; Wed, 21 Oct 2020 00:24:20 +0000 (UTC) Received: by mail-pj1-f65.google.com with SMTP id hk7so217776pjb.2 for ; Tue, 20 Oct 2020 17:24:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zg2SXutEVvYpX38Q2I41hBI0ZZf+GuG+gnYR0e8ijiM=; b=img+CLkzsEbbaBsnspEaEMM++3ffA2QEk/7WZpgT+8iJkLsheKUa5pP7FZxRnXTFCy 41L8oiRWKVXF8Ju11n+kfX+NgZ/pmLOakCz5+EsMe4dcdWbTvLVXZKt6lpy3Uorxmmuq knco0hO/jpPuG0UUo6aYXFIkOfmcAHbYeanr2+2FvHvm37HowRXv9k45JRSMV4iRAgeJ cHd4ClDt7a6GezjqqBL5FgMstYwv1uFIisrLaNq+pxFYOI+GFYKK5GVdS/EEcug0Btrj ZhFxQBLnW7P18d29nCYhLmPFOzSTo3GtAJrtFyJ+77iy0fY/k0GEx4brSzen92UB/4xk zT6g== X-Gm-Message-State: AOAM532SKNT/lVPRkjx+Ueux+glC6rmD6T6J3IF6AD8tR114o7YD/sGC psb4Dsdc9nmq/tqXt3nGlt5TpTl/LpLLSw== X-Google-Smtp-Source: ABdhPJykX4I+Ed6FmkRa8exj0GUlXUJm/krdg+fkvaCvEeLZjP8ZFRQjvck1AFdJuaqORbAZC6GMqA== X-Received: by 2002:a17:90b:4189:: with SMTP id hh9mr612657pjb.199.1603239858663; Tue, 20 Oct 2020 17:24:18 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id q13sm184797pfg.3.2020.10.20.17.24.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 17:24:17 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 13/37] targets: Remove more clst_ prefixes Date: Tue, 20 Oct 2020 17:23:20 -0700 Message-Id: <20201021002344.378131-13-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201021002344.378131-1-mattst88@gentoo.org> References: <20201021002344.378131-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 6d3c4368-0fe3-402e-86cb-445eccbc45de X-Archives-Hash: 448b48e139e78c727267b5bbd083968f clst_* prefixed variables are created by setup_environment(), which these variables are not. Signed-off-by: Matt Turner --- targets/embedded/controller.sh | 2 +- targets/livecd-stage2/controller.sh | 4 +- targets/netboot/controller.sh | 4 +- targets/stage4/controller.sh | 4 +- targets/support/bootloader-setup.sh | 6 +- targets/support/kmerge.sh | 112 ++++++++++++++-------------- 6 files changed, 66 insertions(+), 66 deletions(-) diff --git a/targets/embedded/controller.sh b/targets/embedded/controller.sh index e40a913f..d0bf331d 100755 --- a/targets/embedded/controller.sh +++ b/targets/embedded/controller.sh @@ -40,7 +40,7 @@ case ${1} in kernel) shift - export clst_kname="${1}" + export kname="${1}" [ -n "${clst_linuxrc}" ] && \ copy_to_chroot ${clst_linuxrc} /tmp/linuxrc diff --git a/targets/livecd-stage2/controller.sh b/targets/livecd-stage2/controller.sh index 0701a26b..566571e6 100755 --- a/targets/livecd-stage2/controller.sh +++ b/targets/livecd-stage2/controller.sh @@ -15,14 +15,14 @@ case $1 in kernel) shift - export clst_kname="$1" + export kname="$1" [ -n "${clst_linuxrc}" ] && \ copy_to_chroot ${clst_linuxrc} /tmp/linuxrc exec_in_chroot ${clst_shdir}/support/kmerge.sh delete_from_chroot /tmp/linuxrc - extract_modules ${clst_chroot_path} ${clst_kname} + extract_modules ${clst_chroot_path} ${kname} #16:12 <@solar> kernel_name=foo #16:13 <@solar> eval clst_boot_kernel_${kernel_name}_config=bar #16:13 <@solar> eval echo \$clst_boot_kernel_${kernel_name}_config diff --git a/targets/netboot/controller.sh b/targets/netboot/controller.sh index f84a32bd..e6fc9d2b 100755 --- a/targets/netboot/controller.sh +++ b/targets/netboot/controller.sh @@ -24,7 +24,7 @@ case ${1} in kernel) shift - export clst_kname="$1" + export kname="$1" [ -n "${clst_linuxrc}" ] && \ copy_to_chroot ${clst_linuxrc} /tmp/linuxrc @@ -36,7 +36,7 @@ case ${1} in delete_from_chroot /tmp/linuxrc delete_from_chroot /tmp/busy-config - extract_modules ${clst_chroot_path} ${clst_kname} + extract_modules ${clst_chroot_path} ${kname} #16:12 <@solar> kernel_name=foo #16:13 <@solar> eval clst_boot_kernel_${kernel_name}_config=bar #16:13 <@solar> eval echo \$clst_boot_kernel_${kernel_name}_config diff --git a/targets/stage4/controller.sh b/targets/stage4/controller.sh index 7ca3e9bc..7825f800 100755 --- a/targets/stage4/controller.sh +++ b/targets/stage4/controller.sh @@ -21,7 +21,7 @@ case $1 in kernel) shift - export clst_kname="$1" + export kname="$1" # If we have our own linuxrc, copy it in [ -n "${clst_linuxrc}" ] && \ @@ -29,7 +29,7 @@ case $1 in exec_in_chroot ${clst_shdir}/support/kmerge.sh delete_from_chroot /tmp/linuxrc - extract_modules ${clst_chroot_path} ${clst_kname} + extract_modules ${clst_chroot_path} ${kname} ;; build_packages) diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh index 0643a04c..a82b69dc 100755 --- a/targets/support/bootloader-setup.sh +++ b/targets/support/bootloader-setup.sh @@ -102,7 +102,7 @@ case ${clst_hostarch} in echo '' >> ${iacfg} for x in ${clst_boot_kernel} do - eval "clst_kernel_console=\$clst_boot_kernel_${x}_console" + eval "kernel_console=\$clst_boot_kernel_${x}_console" eval custom_kopts=\$${x}_kernelopts echo "menuentry 'Boot LiveCD (kernel: ${x})' --class gnu-linux --class os {" >> ${iacfg} @@ -114,10 +114,10 @@ case ${clst_hostarch} in echo " linux ${kern_subdir}/${x} ${default_append_line[@]} docache" >> ${iacfg} echo " initrd ${kern_subdir}/${x}.igz" >> ${iacfg} echo "}" >> ${iacfg} - if [ -n "${clst_kernel_console}" ] + if [ -n "${kernel_console}" ] then echo "submenu 'Special console options (kernel: ${x})' --class gnu-linux --class os {" >> ${iacfg} - for y in ${clst_kernel_console} + for y in ${kernel_console} do echo "menuentry 'Boot LiveCD (kernel: ${x} console=${y})' --class gnu-linux --class os {" >> ${iacfg} echo " linux ${kern_subdir}/${x} ${default_append_line[@]} console=${y}" >> ${iacfg} diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 0e72e98b..15a21b90 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -3,17 +3,17 @@ source /tmp/chroot-functions.sh install -d /tmp/kerncache -PKGDIR=/tmp/kerncache/${clst_kname}/ebuilds +PKGDIR=/tmp/kerncache/${kname}/ebuilds setup_gk_args() { # default genkernel args GK_ARGS=( - "${clst_kernel_gk_kernargs[@]}" - --cachedir=/tmp/kerncache/${clst_kname}-genkernel_cache-${clst_version_stamp} + "${kernel_gk_kernargs[@]}" + --cachedir=/tmp/kerncache/${kname}-genkernel_cache-${clst_version_stamp} --no-mountboot --kerneldir=/usr/src/linux - --modulespackage=/tmp/kerncache/${clst_kname}-modules-${clst_version_stamp}.tar.bz2 - --minkernpackage=/tmp/kerncache/${clst_kname}-kernel-initrd-${clst_version_stamp}.tar.bz2 all + --modulespackage=/tmp/kerncache/${kname}-modules-${clst_version_stamp}.tar.bz2 + --minkernpackage=/tmp/kerncache/${kname}-kernel-initrd-${clst_version_stamp}.tar.bz2 all ) # extra genkernel options that we have to test for if [ -n "${clst_gk_mainargs}" ] @@ -22,16 +22,16 @@ setup_gk_args() { fi if [ -n "${clst_KERNCACHE}" ] then - GK_ARGS+=(--kerncache=/tmp/kerncache/${clst_kname}-kerncache-${clst_version_stamp}.tar.bz2) + GK_ARGS+=(--kerncache=/tmp/kerncache/${kname}-kerncache-${clst_version_stamp}.tar.bz2) fi - if [ -e /var/tmp/${clst_kname}.config ] + if [ -e /var/tmp/${kname}.config ] then - GK_ARGS+=(--kernel-config=/var/tmp/${clst_kname}.config) + GK_ARGS+=(--kernel-config=/var/tmp/${kname}.config) fi - if [ -d "/tmp/initramfs_overlay/${clst_initramfs_overlay}" ] + if [ -d "/tmp/initramfs_overlay/${initramfs_overlay}" ] then - GK_ARGS+=(--initramfs-overlay=/tmp/initramfs_overlay/${clst_initramfs_overlay}) + GK_ARGS+=(--initramfs-overlay=/tmp/initramfs_overlay/${initramfs_overlay}) fi if [ -n "${clst_CCACHE}" ] then @@ -70,10 +70,10 @@ genkernel_compile(){ # Build our list of kernel packages case ${clst_livecd_type} in gentoo-release-live*) - if [ -n "${clst_kernel_merge}" ] + if [ -n "${kernel_merge}" ] then mkdir -p /usr/livecd - echo "${clst_kernel_merge}" > /usr/livecd/kernelpkgs.txt + echo "${kernel_merge}" > /usr/livecd/kernelpkgs.txt fi ;; esac @@ -94,17 +94,17 @@ genkernel_compile(){ then gk_callback_opts+=(-f) fi - if [ "${clst_kernel_merge}" != "" ] + if [ "${kernel_merge}" != "" ] then - genkernel --callback="emerge ${gk_callback_opts[@]} ${clst_kernel_merge}" \ + genkernel --callback="emerge ${gk_callback_opts[@]} ${kernel_merge}" \ "${GK_ARGS[@]}" || exit 1 else genkernel "${GK_ARGS[@]}" || exit 1 fi - if [ -n "${clst_KERNCACHE}" -a -e /var/tmp/${clst_kname}.config ] + if [ -n "${clst_KERNCACHE}" -a -e /var/tmp/${kname}.config ] then - md5sum /var/tmp/${clst_kname}.config | awk '{print $1}' > \ - /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG + md5sum /var/tmp/${kname}.config | awk '{print $1}' > \ + /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.CONFIG fi } @@ -115,15 +115,15 @@ export CONFIG_PROTECT="-*" rm /etc/localtime cp -f /usr/share/zoneinfo/UTC /etc/localtime -eval "clst_initramfs_overlay=\$clst_boot_kernel_${kname}_initramfs_overlay" -eval "clst_kernel_merge=\$clst_boot_kernel_${kname}_packages" -eval "clst_kernel_use=\$clst_boot_kernel_${kname}_use" -eval eval clst_kernel_gk_kernargs=( \$clst_boot_kernel_${kname}_gk_kernargs ) -eval "clst_ksource=\$clst_boot_kernel_${kname}_sources" +eval "initramfs_overlay=\$clst_boot_kernel_${kname}_initramfs_overlay" +eval "kernel_merge=\$clst_boot_kernel_${kname}_packages" +eval "kernel_use=\$clst_boot_kernel_${kname}_use" +eval eval kernel_gk_kernargs=( \$clst_boot_kernel_${kname}_gk_kernargs ) +eval "ksource=\$clst_boot_kernel_${kname}_sources" -if [ -z "${clst_ksource}" ] +if [ -z "${ksource}" ] then - clst_ksource="virtual/linux-sources" + ksource="virtual/linux-sources" fi # Don't use pkgcache here, as the kernel source may get emerged with different @@ -137,25 +137,25 @@ if [ -n "${clst_KERNCACHE}" ] then USE_MATCH=0 - if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE ] + if [ -e /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.USE ] then - STR1=$(for i in `cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE`; do echo $i; done|sort) - STR2=$(for i in ${clst_kernel_use}; do echo $i; done|sort) + STR1=$(for i in `cat /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.USE`; do echo $i; done|sort) + STR2=$(for i in ${kernel_use}; do echo $i; done|sort) if [ "${STR1}" = "${STR2}" ] then USE_MATCH=1 else - [ -d /tmp/kerncache/${clst_kname}/ebuilds ] && \ - rm -r /tmp/kerncache/${clst_kname}/ebuilds - [ -e /tmp/kerncache/${clst_kname}/usr/src/linux/.config ] && \ - rm /tmp/kerncache/${clst_kname}/usr/src/linux/.config + [ -d /tmp/kerncache/${kname}/ebuilds ] && \ + rm -r /tmp/kerncache/${kname}/ebuilds + [ -e /tmp/kerncache/${kname}/usr/src/linux/.config ] && \ + rm /tmp/kerncache/${kname}/usr/src/linux/.config fi fi EXTRAVERSION_MATCH=0 - if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION ] + if [ -e /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.EXTRAVERSION ] then - STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION` + STR1=`cat /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.EXTRAVERSION` STR2=${clst_kextraversion} if [ "${STR1}" = "${STR2}" ] then @@ -164,14 +164,14 @@ then fi CONFIG_MATCH=0 - if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG ] + if [ -e /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.CONFIG ] then - if [ ! -e /var/tmp/${clst_kname}.config ] + if [ ! -e /var/tmp/${kname}.config ] then CONFIG_MATCH=1 else - STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG` - STR2=`md5sum /var/tmp/${clst_kname}.config|awk '{print $1}'` + STR1=`cat /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.CONFIG` + STR2=`md5sum /var/tmp/${kname}.config|awk '{print $1}'` if [ "${STR1}" = "${STR2}" ] then CONFIG_MATCH=1 @@ -181,14 +181,14 @@ then # install dependencies of kernel sources ahead of time in case # package.provided generated below causes them not to be (re)installed - PKGDIR=${PKGDIR} run_merge --onlydeps "${clst_ksource}" + PKGDIR=${PKGDIR} run_merge --onlydeps "${ksource}" # Create the kerncache directory if it doesn't exists - mkdir -p /tmp/kerncache/${clst_kname} + mkdir -p /tmp/kerncache/${kname} - if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.KERNELVERSION ] + if [ -e /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.KERNELVERSION ] then - KERNELVERSION=$( ${clst_port_conf}/profile/package.provided else @@ -196,26 +196,26 @@ then fi # Don't use package.provided if there's a pending up/downgrade - if [[ "$(portageq best_visible / ${clst_ksource})" == "${KERNELVERSION}" ]]; then - echo "No pending updates for ${clst_ksource}" + if [[ "$(portageq best_visible / ${ksource})" == "${KERNELVERSION}" ]]; then + echo "No pending updates for ${ksource}" else - echo "Pending updates for ${clst_ksource}, removing package.provided" + echo "Pending updates for ${ksource}, removing package.provided" rm -f ${clst_port_conf}/profile/package.provided fi [ -L /usr/src/linux ] && rm -f /usr/src/linux - PKGDIR=${PKGDIR} run_merge "${clst_ksource}" + PKGDIR=${PKGDIR} run_merge "${ksource}" - SOURCESDIR="/tmp/kerncache/${clst_kname}/sources" + SOURCESDIR="/tmp/kerncache/${kname}/sources" if [ -L /usr/src/linux ] then # A kernel was merged, move it to $SOURCESDIR [ -e ${SOURCESDIR} ] && rm -Rf ${SOURCESDIR} - KERNELVERSION=`portageq best_visible / "${clst_ksource}"` - echo "${KERNELVERSION}" > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.KERNELVERSION + KERNELVERSION=`portageq best_visible / "${ksource}"` + echo "${KERNELVERSION}" > /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.KERNELVERSION echo "Moving kernel sources to ${SOURCESDIR} ..." mv `readlink -f /usr/src/linux` ${SOURCESDIR} @@ -231,18 +231,18 @@ then then echo "Setting extraversion to ${clst_kextraversion}" sed -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" /usr/src/linux/Makefile - echo ${clst_kextraversion} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION + echo ${clst_kextraversion} > /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.EXTRAVERSION else - touch /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION + touch /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.EXTRAVERSION fi fi else - run_merge "${clst_ksource}" + run_merge "${ksource}" #ensure that there is a /usr/src/linux symlink and it points to the sources we just installed echo "Adjusting /usr/src/linux to point to \ -$(portageq contents / $(portageq best_visible / "${clst_ksource}" 2>/dev/null) 2>/dev/null | grep --color=never '/usr/src/' | head -n1 2>/dev/null)" - ln -snf $(portageq contents / $(portageq best_visible / "${clst_ksource}" 2>/dev/null) 2>/dev/null | grep --color=never '/usr/src/' | head -n1 2>/dev/null) \ +$(portageq contents / $(portageq best_visible / "${ksource}" 2>/dev/null) 2>/dev/null | grep --color=never '/usr/src/' | head -n1 2>/dev/null)" + ln -snf $(portageq contents / $(portageq best_visible / "${ksource}" 2>/dev/null) 2>/dev/null | grep --color=never '/usr/src/' | head -n1 2>/dev/null) \ /usr/src/linux if [ ! "${clst_kextraversion}" = "" ] then @@ -254,14 +254,14 @@ fi # Update USE flag in make.conf [ -e ${clst_make_conf} ] && \ - echo "USE=\"\${USE} ${clst_kernel_use} build\"" >> ${clst_make_conf} + echo "USE=\"\${USE} ${kernel_use} build\"" >> ${clst_make_conf} make_destpath genkernel_compile -sed -i "/USE=\"\${USE} ${clst_kernel_use} \"/d" ${clst_make_conf} +sed -i "/USE=\"\${USE} ${kernel_use} \"/d" ${clst_make_conf} # grep out the kernel version so that we can do our modules magic VER=`grep ^VERSION\ \= /usr/src/linux/Makefile | awk '{ print $3 };'` PAT=`grep ^PATCHLEVEL\ \= /usr/src/linux/Makefile | awk '{ print $3 };'` @@ -274,5 +274,5 @@ unset USE if [ -n "${clst_KERNCACHE}" ] then - echo ${clst_kernel_use} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE + echo ${kernel_use} > /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.USE fi -- 2.26.2