Skip to content

Commit cc66dc6

Browse files
authored
Fix config saving when building inside tmpfs (#285)
When building inside tmpfs, ``$srcdir`` and ``$pkgdir``, their parent directory will not be the directory with PKGBUILD, but /tmp. So we need to read symlink of one of the files in ``$srcdir`` to figure out where the directory with PKGBUILD actually is.
1 parent a496470 commit cc66dc6

File tree

11 files changed

+22
-11
lines changed

11 files changed

+22
-11
lines changed

linux-cachyos-bore/PKGBUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,8 @@ prepare() {
523523

524524
### Save configuration for later reuse
525525
echo "Save configuration for later reuse..."
526-
cat .config > "${srcdir}/../config-${pkgver}-${pkgrel}${pkgbase#linux}"
526+
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
527+
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
527528

528529
if [ -n "$_build_nvidia" ]; then
529530
cd "${srcdir}"

linux-cachyos-deckify/PKGBUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,8 @@ prepare() {
526526

527527
### Save configuration for later reuse
528528
echo "Save configuration for later reuse..."
529-
cat .config > "${srcdir}/../config-${pkgver}-${pkgrel}${pkgbase#linux}"
529+
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
530+
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
530531

531532
if [ -n "$_build_nvidia" ]; then
532533
cd "${srcdir}"

linux-cachyos-echo/PKGBUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,8 @@ prepare() {
523523

524524
### Save configuration for later reuse
525525
echo "Save configuration for later reuse..."
526-
cat .config > "${srcdir}/../config-${pkgver}-${pkgrel}${pkgbase#linux}"
526+
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
527+
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
527528

528529
if [ -n "$_build_nvidia" ]; then
529530
cd "${srcdir}"

linux-cachyos-eevdf/PKGBUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,8 @@ prepare() {
523523

524524
### Save configuration for later reuse
525525
echo "Save configuration for later reuse..."
526-
cat .config > "${srcdir}/../config-${pkgver}-${pkgrel}${pkgbase#linux}"
526+
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
527+
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
527528

528529
if [ -n "$_build_nvidia" ]; then
529530
cd "${srcdir}"

linux-cachyos-hardened/PKGBUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,8 @@ prepare() {
523523

524524
### Save configuration for later reuse
525525
echo "Save configuration for later reuse..."
526-
cat .config > "${srcdir}/../config-${pkgver}-${pkgrel}${pkgbase#linux}"
526+
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
527+
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
527528

528529
if [ -n "$_build_nvidia" ]; then
529530
cd "${srcdir}"

linux-cachyos-lts/PKGBUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,8 @@ prepare() {
591591

592592
### Save configuration for later reuse
593593
echo "Save configuration for later reuse..."
594-
cat .config > "${srcdir}/../config-${pkgver}-${pkgrel}${pkgbase#linux}"
594+
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
595+
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
595596

596597
if [ -n "$_build_nvidia" ]; then
597598
cd "${srcdir}"

linux-cachyos-rc/PKGBUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,8 @@ prepare() {
525525

526526
### Save configuration for later reuse
527527
echo "Save configuration for later reuse..."
528-
cat .config > "${srcdir}/../config-${pkgver}-${pkgrel}${pkgbase#linux}"
528+
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
529+
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
529530

530531
if [ -n "$_build_nvidia" ]; then
531532
cd "${srcdir}"

linux-cachyos-rt-bore/PKGBUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,8 @@ prepare() {
523523

524524
### Save configuration for later reuse
525525
echo "Save configuration for later reuse..."
526-
cat .config > "${srcdir}/../config-${pkgver}-${pkgrel}${pkgbase#linux}"
526+
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
527+
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
527528

528529
if [ -n "$_build_nvidia" ]; then
529530
cd "${srcdir}"

linux-cachyos-sched-ext/PKGBUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,8 @@ prepare() {
523523

524524
### Save configuration for later reuse
525525
echo "Save configuration for later reuse..."
526-
cat .config > "${srcdir}/../config-${pkgver}-${pkgrel}${pkgbase#linux}"
526+
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
527+
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
527528

528529
if [ -n "$_build_nvidia" ]; then
529530
cd "${srcdir}"

linux-cachyos-server/PKGBUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,8 @@ prepare() {
523523

524524
### Save configuration for later reuse
525525
echo "Save configuration for later reuse..."
526-
cat .config > "${srcdir}/../config-${pkgver}-${pkgrel}${pkgbase#linux}"
526+
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
527+
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
527528

528529
if [ -n "$_build_nvidia" ]; then
529530
cd "${srcdir}"

0 commit comments

Comments
 (0)