Changeset 5a1f883 for chapter10

Timestamp:

08/08/2023 01:22:00 PM (11 months ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib

Children:

60a942a

Parents:

feb8dee (diff), 9cca53d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automatic merge of trunk into multilib

Location:

chapter10/kernel

Files:

• Makefile (modified) (1 diff)
• kernel.version (modified) (1 diff)

chapter10/kernel/Makefile

@@ -9 +9 @@
 
 kernel.version: s-kernel-version; @true
-s-kernel-version: Makefile kernel_version.py
+
+.PHONY: s-kernel-version
+s-kernel-version:
         ./kernel_version.py $(KERNEL_TREE) > tmp-kernel.version
-        if ! diff tmp-kernel.version $@ 2>/dev/null >/dev/null; then \
+        if ! diff tmp-kernel.version kernel.version ; then           \
                 mv tmp-kernel.version kernel.version;                    \
+        else                                                         \
+                rm tmp-kernel.version;                                   \
         fi
         touch s-kernel-version

chapter10/kernel/kernel.version

@@ -1 @@
-6.4.7
+6.4.8