Changes in Makefile

fb3f7f0f - initramfs: shorten cmd_initfs in usr/Makefile

Fri, 31 May 2024 12:28:25 +0000

initramfs: shorten cmd_initfs in usr/MakefileAvoid repetition of long variables.No functional change intended.Signed-off-by: Masahiro Yamada Reviewed-by: Nathan Chancellor List of files: /linux-6.15/usr/Makefile

b1992c37 - kbuild: use $(src) instead of $(srctree)/$(src) for source directory

Sat, 27 Apr 2024 14:55:02 +0000

kbuild: use $(src) instead of $(srctree)/$(src) for source directoryKbuild conventionally uses $(obj)/ for generated files, and $(src)/ forchecked-in source files. It is merely a convention without any functionaldifference. In fact, $(obj) and $(src) are exactly the same, as definedin scripts/Makefile.build: src := $(obj)When the kernel is built in a separate output directory, $(src) doesnot accurately reflect the source directory location. While Kbuildresolves this discrepancy by specifying VPATH=$(srctree) to search forsource files, it does not cover all cases. For example, when adding aheader search path for local headers, -I$(srctree)/$(src) is typicallypassed to the compiler.This introduces inconsistency between upstream and downstream Makefilesbecause $(src) is used instead of $(srctree)/$(src) for the latter.To address this inconsistency, this commit changes the semantics of$(src) so that it always points to the directory in the source tree.Going forward, the variables used in Makefiles will have the followingmeanings: $(obj) - directory in the object tree $(src) - directory in the source tree (changed by this commit) $(objtree) - the top of the kernel object tree $(srctree) - the top of the kernel source treeConsequently, $(srctree)/$(src) in upstream Makefiles need to be replacedwith $(src).Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/usr/Makefile

7f8256ae - initramfs: Encode dependency on KBUILD_BUILD_TIMESTAMP

Tue, 06 Jun 2023 06:17:41 +0000

initramfs: Encode dependency on KBUILD_BUILD_TIMESTAMPgen_initramfs.sh has an internal dependency on KBUILD_BUILD_TIMESTAMPfor generating file mtimes that is not exposed to make, so changingKBUILD_BUILD_TIMESTAMP will not trigger a rebuild of the archive.Declare the mtime date as a new parameter to gen_initramfs.sh to encodeKBUILD_BUILD_TIMESTAMP in the shell command, thereby making make awareof the dependency.It will rebuild if KBUILD_BUILD_TIMESTAMP changes or is newly set/unset.It will _not_ rebuild if KBUILD_BUILD_TIMESTAMP is unset before andafter. This should be fine for anyone who doesn't care about settingspecific build times in the first place.Reviewed-by: Andrew Donnellan Tested-by: Andrew Donnellan Signed-off-by: Benjamin Gray Reviewed-by: Nicolas Schier Signed-off-by: Masahiro Yamada List of files: /linux-6.15/usr/Makefile

a5575df5 - kbuild: unify cmd_copy and cmd_shipped

Tue, 25 Jan 2022 06:40:27 +0000

kbuild: unify cmd_copy and cmd_shippedcmd_copy and cmd_shipped have similar functionality. The difference isthat cmd_copy uses 'cp' while cmd_shipped 'cat'.Unify them into cmd_copy because this macro name is more intuitive.Going forward, cmd_copy will use 'cat' to avoid the permission issue.I also thought of 'cp --no-preserve=mode' but this option is notmentioned in the POSIX spec [1], so I am keeping the 'cat' command.[1]: https://pubs.opengroup.org/onlinepubs/009695299/utilities/cp.htmlSigned-off-by: Masahiro Yamada Reviewed-by: Nick Desaulniers Reviewed-by: Gabriel Krisman Bertazi List of files: /linux-6.15/usr/Makefile

7ce7e984 - kbuild: rename cmd_{bzip2,lzma,lzo,lz4,xzkern,zstd22}

Sun, 09 Jan 2022 18:15:27 +0000

kbuild: rename cmd_{bzip2,lzma,lzo,lz4,xzkern,zstd22}GZIP-compressed files end with 4 byte data that represents the sizeof the original input. The decompressors (the self-extracting kernel)exploit it to know the vmlinux size beforehand. To mimic the GZIP'strailer, Kbuild provides cmd_{bzip2,lzma,lzo,lz4,xzkern,zstd22}.Unfortunately these macros are used everywhere despite the appendedsize data is only useful for the decompressors.There is no guarantee that such hand-crafted trailers are safely ignored.In fact, the kernel refuses compressed initramdfs with the garbage data.That is why usr/Makefile overrides size_append to make it no-op.To limit the use of such broken compressed files, this commit renamesthe existing macros as follows: cmd_bzip2 --> cmd_bzip2_with_size cmd_lzma --> cmd_lzma_with_size cmd_lzo --> cmd_lzo_with_size cmd_lz4 --> cmd_lz4_with_size cmd_xzkern --> cmd_xzkern_with_size cmd_zstd22 --> cmd_zstd22_with_sizeTo keep the decompressors working, I updated the following Makefilesaccordingly: arch/arm/boot/compressed/Makefile arch/h8300/boot/compressed/Makefile arch/mips/boot/compressed/Makefile arch/parisc/boot/compressed/Makefile arch/s390/boot/compressed/Makefile arch/sh/boot/compressed/Makefile arch/x86/boot/compressed/MakefileI reused the current macro names for the normal usecases; they producethe compressed data in the proper format.I did not touch the following: arch/arc/boot/Makefile arch/arm64/boot/Makefile arch/csky/boot/Makefile arch/mips/boot/Makefile arch/riscv/boot/Makefile arch/sh/boot/Makefile kernel/MakefileThis means those Makefiles will stop appending the size data.I dropped the 'override size_append' hack from usr/Makefile.Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/usr/Makefile

129ab0d2 - kbuild: do not quote string values in include/config/auto.conf

Tue, 14 Dec 2021 02:53:53 +0000

kbuild: do not quote string values in include/config/auto.confThe previous commit fixed up all shell scripts to not includeinclude/config/auto.conf.Now that include/config/auto.conf is only included by Makefiles,we can change it into a more Make-friendly form.Previously, Kconfig output string values enclosed with double-quotes(both in the .config and include/config/auto.conf): CONFIG_X="foo bar"Unlike shell, Make handles double-quotes (and single-quotes as well)verbatim. We must rip them off when used.There are some patterns: [1] $(patsubst "%",%,$(CONFIG_X)) [2] $(CONFIG_X:"%"=%) [3] $(subst ",,$(CONFIG_X)) [4] $(shell echo $(CONFIG_X))These are not only ugly, but also fragile.[1] and [2] do not work if the value contains spaces, like CONFIG_X=" foo bar "[3] does not work correctly if the value contains double-quotes like CONFIG_X="foo\"bar"[4] seems to work better, but has a cost of forking a process.Anyway, quoted strings were always PITA for our Makefiles.This commit changes Kconfig to stop quoting in include/config/auto.conf.These are the string type symbols referenced in Makefiles or scripts: ACPI_CUSTOM_DSDT_FILE ARC_BUILTIN_DTB_NAME ARC_TUNE_MCPU BUILTIN_DTB_SOURCE CC_IMPLICIT_FALLTHROUGH CC_VERSION_TEXT CFG80211_EXTRA_REGDB_KEYDIR EXTRA_FIRMWARE EXTRA_FIRMWARE_DIR EXTRA_TARGETS H8300_BUILTIN_DTB INITRAMFS_SOURCE LOCALVERSION MODULE_SIG_HASH MODULE_SIG_KEY NDS32_BUILTIN_DTB NIOS2_DTB_SOURCE OPENRISC_BUILTIN_DTB SOC_CANAAN_K210_DTB_SOURCE SYSTEM_BLACKLIST_HASH_LIST SYSTEM_REVOCATION_KEYS SYSTEM_TRUSTED_KEYS TARGET_CPU UNUSED_KSYMS_WHITELIST XILINX_MICROBLAZE0_FAMILY XILINX_MICROBLAZE0_HW_VER XTENSA_VARIANT_NAMEI checked them one by one, and fixed up the code where necessary.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/usr/Makefile

a30d8a39 - usr: Add support for zstd compressed initramfs

Thu, 30 Jul 2020 19:08:37 +0000

usr: Add support for zstd compressed initramfs- Add support for a zstd compressed initramfs.- Add compression for compressing built-in initramfs with zstd.I have tested this patch by boot testing with buildroot and QEMU.Specifically, I booted the kernel with both a zstd and gzip compressedinitramfs, both built into the kernel and separate. I ensured that thecorrect compression algorithm was used. I tested on arm, aarch64, i386,and x86_64.This patch has been tested in production on aarch64 and x86_64 devices.Additionally, I have performance measurements from internal use inproduction. On an aarch64 device we saw 19 second boot time improvementfrom switching from lzma to zstd (27 seconds to 8 seconds). On an x86_64device we saw a 9 second boot time reduction from switching from xz tozstd.Signed-off-by: Nick Terrell Signed-off-by: Ingo Molnar Tested-by: Sedat Dilek Reviewed-by: Kees Cook Link: https://lore.kernel.org/r/20200730190841.2071656-5-nickrterrell@gmail.com List of files: /linux-6.15/usr/Makefile

d4e9056d - initramfs: do not show compression mode choice if INITRAMFS_SOURCE is empty

Mon, 03 Feb 2020 16:47:08 +0000

initramfs: do not show compression mode choice if INITRAMFS_SOURCE is emptySince commit ddd09bcc899f ("initramfs: make compression options notdepend on INITRAMFS_SOURCE"), Kconfig asks the compression mode forthe built-in initramfs regardless of INITRAMFS_SOURCE.It is technically simpler, but pointless from a UI perspective,Linus says [1].When INITRAMFS_SOURCE is empty, usr/Makefile creates a tiny defaultcpio, which is so small that nobody cares about the compression.This commit hides the Kconfig choice in that case. The default cpiois embedded without compression, which was the original behavior.[1]: https://lkml.org/lkml/2020/2/1/160Suggested-by: Linus Torvalds Signed-off-by: Masahiro Yamada Signed-off-by: Linus Torvalds List of files: /linux-6.15/usr/Makefile

5f2fb52f - kbuild: rename hostprogs-y/always to hostprogs/always-y

Sat, 01 Feb 2020 16:49:24 +0000

kbuild: rename hostprogs-y/always to hostprogs/always-yIn old days, the "host-progs" syntax was used for specifying hostprograms. It was renamed to the current "hostprogs-y" in 2004.It is typically useful in scripts/Makefile because it allows Kbuild toselectively compile host programs based on the kernel configuration.This commit renames like follows: always -> always-y hostprogs-y -> hostprogsSo, scripts/Makefile will look like this: always-$(CONFIG_BUILD_BIN2C) += ... always-$(CONFIG_KALLSYMS) += ... ... hostprogs := $(always-y) $(always-m)I think this makes more sense because a host program is always a hostprogram, irrespective of the kernel configuration. We want to specifywhich ones to compile by CONFIG options, so always-y will be handier.The "always", "hostprogs-y", "hostprogs-m" will be kept for backwardcompatibility for a while.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/usr/Makefile

65e00e04 - initramfs: refactor the initramfs build rules

Sat, 04 Jan 2020 15:02:37 +0000

initramfs: refactor the initramfs build rulesCurrently, usr/gen_initramfs.sh takes care of all the use-cases: [1] generates a cpio file unless CONFIG_INITRAMFS_SOURCE points to a single cpio archive [2] If CONFIG_INITRAMFS_SOURCE is the path to a cpio archive, use it as-is. [3] Compress the cpio file according to CONFIG_INITRAMFS_COMPRESSION_* unless it is passed a compressed archive.To simplify the script, move [2] and [3] to usr/Makefile.If CONFIG_INITRAMFS_SOURCE is the path to a cpio archive, there isno need to run this shell script.For the cpio archive compression, you can re-use the rules fromscripts/Makefile.lib .Signed-off-by: Masahiro Yamada List of files: /linux-6.15/usr/Makefile

4538f413 - initramfs: add default_cpio_list, and delete -d option support

Sat, 04 Jan 2020 15:02:35 +0000

initramfs: add default_cpio_list, and delete -d option supportWhen CONFIG_INITRAMFS_SOURCE is empty, the Makefile passes the -doption to gen_initramfs.sh to create the default initramfs, whichcontains /dev, /dev/console, and /root.This commit simplifies the default behavior; remove the -d option,and add the default cpio list.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/usr/Makefile

96680975 - initramfs: generate dependency list and cpio at the same time

Sat, 04 Jan 2020 15:02:34 +0000

initramfs: generate dependency list and cpio at the same timeCurrently, this script is run twice, for the dependency list, and thenfor the cpio archive.The first one is re-run every time although its build log is suppressedso nobody notices it.Make it work more efficiently by generating the cpio and the dependencylist at the same time.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/usr/Makefile

3e176683 - initramfs: specify $(src)/gen_initramfs.sh as a prerequisite in Makefile

Sat, 04 Jan 2020 15:02:33 +0000

initramfs: specify $(src)/gen_initramfs.sh as a prerequisite in MakefileSpecify the dependency directly in the Makefile.Signed-off-by: Masahiro Yamada Reviewed-by: Greg Thelen List of files: /linux-6.15/usr/Makefile

80e715a0 - initramfs: rename gen_initramfs_list.sh to gen_initramfs.sh

Sat, 04 Jan 2020 15:02:29 +0000

initramfs: rename gen_initramfs_list.sh to gen_initramfs.shThe comments in usr/Makefile wrongly refer to the script name (twice).Line 37: # The dependency list is generated by gen_initramfs.sh -lLine 54: # 4) Arguments to gen_initramfs.sh changesThere does not exist such a script.I was going to fix the comments, but after some consideration, I thought"gen_initramfs.sh" would be more suitable than "gen_initramfs_list.sh"because it generates an initramfs image in the common usage.The script generates a list that can be fed to gen_init_cpio only whenit is directly run without -o or -l option.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/usr/Makefile

a2183c04 - initramfs: replace klibcdirs in Makefile with FORCE

Sat, 04 Jan 2020 15:02:26 +0000

initramfs: replace klibcdirs in Makefile with FORCE'klibcdirs' was added by commit d39a206bc35d ("kbuild: rebuild initramfsif content of initramfs changes"). If this is just a matter of forcingexecution of the recipe line, we can replace it with FORCE.The following code is currently useless: $(deps_initramfs): klibcdirsThe original intent could be a hook for the klibc integration into thekernel tree, but klibc is a separate project, which can be builtindependently. Clean it up.Signed-off-by: Masahiro Yamada Reviewed-by: Greg Thelen List of files: /linux-6.15/usr/Makefile

6279eb3d - kbuild: clean compressed initramfs image

Mon, 23 Sep 2019 22:33:05 +0000

kbuild: clean compressed initramfs imageSince 9e3596b0c653 ("kbuild: initramfs cleanup, set target from Kconfig")"make clean" leaves behind compressed initramfs images. Example: $ make defconfig $ sed -i 's|CONFIG_INITRAMFS_SOURCE=""|CONFIG_INITRAMFS_SOURCE="/tmp/ir.cpio"|' .config $ make olddefconfig $ make -s $ make -s clean $ git clean -ndxf | grep initramfs Would remove usr/initramfs_data.cpio.gzclean rules do not have CONFIG_* context so they do not know whichcompression format was used. Thus they don't know which files to delete.Tell clean to delete all possible compression formats.Once patched usr/initramfs_data.cpio.gz and friends are deleted by"make clean".Link: http://lkml.kernel.org/r/20190722063251.55541-1-gthelen@google.comFixes: 9e3596b0c653 ("kbuild: initramfs cleanup, set target from Kconfig")Signed-off-by: Greg Thelen Cc: Nicholas Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds List of files: /linux-6.15/usr/Makefile

d6fc9fcb - kbuild: compile-test exported headers to ensure they are self-contained

Mon, 01 Jul 2019 00:58:40 +0000

kbuild: compile-test exported headers to ensure they are self-containedMultiple people have suggested compile-testing UAPI headers to ensurethey can be really included from user-space. "make headers_check" isobviously not enough to catch bugs, and we often leak unresolvedreferences to user-space.Use the new header-test-y syntax to implement it. Please note exportedheaders are compile-tested with a completely different set of compilerflags. The header search path is set to $(objtree)/usr/include sinceexported headers should not include unexported ones.We use -std=gnu89 for the kernel space since the kernel code highlydepends on GNU extensions. On the other hand, UAPI headers should bewritten in more standardized C, so they are compiled with -std=c90.This will emit errors if C++ style comments, the keyword 'inline', etc.are used. Please use C style comments (/* ... */), '__inline__', etc.in UAPI headers.There is additional compiler requirement to enable this test becausemany of UAPI headers include , , ,etc. directly or indirectly. You cannot use kernel.org pre-builttoolchains [1] since they lack .I reused CONFIG_CC_CAN_LINK to check the system header availability.The intention is slightly different, but a compiler that can linkuserspace programs provide system headers.For now, a lot of headers need to be excluded because they cannotbe compiled standalone, but this is a good start point.[1] https://mirrors.edge.kernel.org/pub/tools/crosstool/index.htmlSigned-off-by: Masahiro Yamada Reviewed-by: Sam Ravnborg List of files: /linux-6.15/usr/Makefile

c7fe0608 - user/Makefile: Fix typo and capitalization in comment section

Sat, 01 Dec 2018 16:03:22 +0000

user/Makefile: Fix typo and capitalization in comment sectionSigned-off-by: Eugen Cazacu Signed-off-by: Masahiro Yamada List of files: /linux-6.15/usr/Makefile

f6f57a46 - initramfs: move gen_initramfs_list.sh from scripts/ to usr/

Mon, 20 Aug 2018 15:29:51 +0000

initramfs: move gen_initramfs_list.sh from scripts/ to usr/scripts/gen_initramfs_list.sh is only invoked from usr/Makefile.Move it so that all tools to create initramfs are self-containedin the usr/ directory.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/usr/Makefile

e08b1877 - initramfs: fix initramfs rebuilds w/ compression after disabling

Thu, 02 Nov 2017 22:59:44 +0000

initramfs: fix initramfs rebuilds w/ compression after disablingThis is a follow-up to commit 57ddfdaa9a72 ("initramfs: fix disabling ofinitramfs (and its compression)"). This particular commit fixed the usecase where we build the kernel with an initramfs with no compression,and then we build the kernel with no initramfs.Now this still left us with the same case as described here: http://lkml.kernel.org/r/20170521033337.6197-1-f.fainelli@gmail.comnot working with initramfs compression. This can be seen by thefollowing steps/timestamps: https://www.spinics.net/lists/kernel/msg2598153.html.initramfs_data.cpio.gz.cmd is correct: cmd_usr/initramfs_data.cpio.gz := /bin/bash ./scripts/gen_initramfs_list.sh -o usr/initramfs_data.cpio.gz -u 1000 -g 1000 /home/fainelli/work/uclinux-rootfs/romfs /home/fainelli/work/uclinux-rootfs/misc/initramfs.devand was generated the first time we did generate the gzip initramfs, sothe command has not changed, nor its arguments, so we just don't callit, no initramfs cpio is re-generated as a consequence.The fix for this problem is just to properly keep track of the.initramfs_cpio_data.d file by suffixing it with the compressionextension. This takes care of properly tracking dependencies such thatthe initramfs get (re)generated any time files are added/deleted etc.Link: http://lkml.kernel.org/r/20170930033936.6722-1-f.fainelli@gmail.comFixes: db2aa7fd15e8 ("initramfs: allow again choice of the embedded initramfs compression algorithm")Fixes: 9e3596b0c653 ("kbuild: initramfs cleanup, set target from Kconfig")Signed-off-by: Florian Fainelli Cc: "Francisco Blas Izquierdo Riera (klondike)" Cc: Nicholas Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds List of files: /linux-6.15/usr/Makefile