Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (cc6a8273d5e46aa56ce5d0d8b0cf7a7657c6096d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (cc6a8273d5e46aa56ce5d0d8b0cf7a7657c6096d)
  • Date: Sat, 4 Nov 2023 23:23:08 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

kernels/linux/0001-fix-hard-coded-path-to-awk.patch | 32
--------------------
kernels/linux/HISTORY | 4 ++
kernels/linux/PRE_BUILD | 5 +--
3 files changed, 7 insertions(+), 34 deletions(-)

New commits:
commit cc6a8273d5e46aa56ce5d0d8b0cf7a7657c6096d
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

kernels/linux: converted awk path fixing patch into sed script

diff --git a/kernels/linux/0001-fix-hard-coded-path-to-awk.patch
b/kernels/linux/0001-fix-hard-coded-path-to-awk.patch
deleted file mode 100644
index 10149b2..0000000
--- a/kernels/linux/0001-fix-hard-coded-path-to-awk.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 91f71a3284354257c34f9a019bd30fdd651a4f7c Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <bwlf AT bandrate.org>
-Date: Wed, 3 Jun 2020 13:31:45 +0200
-Subject: [PATCH] fix hard-coded path to awk
-
----
- Documentation/arch/arm/samsung/clksrc-change-registers.awk | 2 +-
- scripts/ld-version.sh | 2 +-
- scripts/ver_linux | 2 +-
- .../selftests/rcutorture/formal/srcu-cbmc/modify_srcu.awk | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Documentation/arch/arm/samsung/clksrc-change-registers.awk
b/Documentation/arch/arm/samsung/clksrc-change-registers.awk
-index 7be1b8aa7..b09b6bfb8 100755
---- a/Documentation/arch/arm/samsung/clksrc-change-registers.awk
-+++ b/Documentation/arch/arm/samsung/clksrc-change-registers.awk
-@@ -1,4 +1,4 @@
--#!/usr/bin/awk -f
-+#!/bin/awk -f
- #
- # Copyright 2010 Ben Dooks <ben-linux AT fluff.org>
- #
-diff --git a/scripts/ver_linux b/scripts/ver_linux
-index 0968a3070..9a7bcccb8 100755
---- a/scripts/ver_linux
-+++ b/scripts/ver_linux
-@@ -1,4 +1,4 @@
--#!/usr/bin/awk -f
-+#!/bin/awk -f
- # SPDX-License-Identifier: GPL-2.0
- # Before running this script please ensure that your PATH is
- # typical as you use for compilation/installation. I use
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index c87a9f3..ba3e162 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,7 @@
+2023-11-04 Pavel Vinogradov <public AT sorcemage.org>
+ * PRE_BUILD, 0001-fix-hard-coded-path-to-awk.patch: deleted the patch,
+ sed script does the job now
+
2023-10-30 Pavel Vinogradov <public AT sorcemage.org>
* latest.defaults: latest_maintenance_patches_6=patch-6.6.0
* info/kernels/6.6: added
diff --git a/kernels/linux/PRE_BUILD b/kernels/linux/PRE_BUILD
index 48e59dc..9bc6738 100755
--- a/kernels/linux/PRE_BUILD
+++ b/kernels/linux/PRE_BUILD
@@ -123,7 +123,6 @@ case "${KMODE}" in
source_check="PATCH[${count}]"
done &&
patch -p1 <
"$SPELL_DIRECTORY/0001-use-ld.bfd-to-prevent-linking-error.patch" &&
- patch -p1 < "$SPELL_DIRECTORY/0001-fix-hard-coded-path-to-awk.patch"
&&

chmod og-w -R $LINUX_SOURCE_DIRECTORY &&
make mrproper
@@ -215,5 +214,7 @@ then
fi &&

# workaround for 4.14.10:
-chmod -f +x "${LINUX_SOURCE_DIRECTORY}/tools/objtool/sync-check.sh"
+chmod -f +x "${LINUX_SOURCE_DIRECTORY}/tools/objtool/sync-check.sh" &&

+# fix path to awk
+find "${LINUX_SOURCE_DIRECTORY}" -name *.awk -exec sed
'/usr\/bin\/awk/s;usr\/;;' -i {} \;



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (cc6a8273d5e46aa56ce5d0d8b0cf7a7657c6096d), Pavel Vinogradov, 11/04/2023

Archive powered by MHonArc 2.6.24.

Top of Page