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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3DFAB15808B for ; Sat, 17 Feb 2024 05:16:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C7ED5E2A20; Sat, 17 Feb 2024 05:16:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A5EF7E2A20 for ; Sat, 17 Feb 2024 05:16:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 86E1D33FD3F for ; Sat, 17 Feb 2024 05:16:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 34E3414CA for ; Sat, 17 Feb 2024 05:16:08 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1708146686.996770aa1c34b80929f9333fa9dc65cab58b9d85.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: Makefile X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 996770aa1c34b80929f9333fa9dc65cab58b9d85 X-VCS-Branch: master Date: Sat, 17 Feb 2024 05:16:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4a7e24a2-5e98-4417-a104-0288f9aebc5d X-Archives-Hash: 1513e2b62ae75429ae18fc0a26c49303 commit: 996770aa1c34b80929f9333fa9dc65cab58b9d85 Author: Timothy Kenno Handojo gmail com> AuthorDate: Wed Feb 14 07:56:54 2024 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sat Feb 17 05:11:26 2024 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=996770aa address some feedback from robbat2 Signed-off-by: Robin H. Johnson gentoo.org> Makefile | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index 7e90b60..3aa8215 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,8 @@ MANPAGE = genkernel.8 # Add off-Git/generated files here that need to be shipped with releases EXTRA_DIST = $(MANPAGE) ChangeLog $(KCONF) +default: all + # First argument in the override file # Second argument is the base file BASE_KCONF = defaults/kernel-generic-config @@ -15,24 +17,20 @@ KCONF = $(GENERATED_KCONF) BUILD_DIR = build FINAL_DEPS = genkernel.conf \ - gen_cmdline.sh \ - gen_initramfs.sh \ - gen_determineargs.sh \ gen_arch.sh \ gen_bootloader.sh \ + gen_cmdline.sh \ gen_compile.sh \ gen_configkernel.sh \ + gen_determineargs.sh \ gen_funcs.sh \ + gen_initramfs.sh \ gen_moddeps.sh \ gen_package.sh \ gen_worker.sh \ path_expander.py -SOFTWARE = BCACHE_TOOLS BOOST BTRFS_PROGS BUSYBOX COREUTILS CRYPTSETUP \ - DMRAID DROPBEAR EUDEV EXPAT E2FSPROGS FUSE GPG \ - HWIDS ISCSI JSON_C KMOD LIBAIO LIBGCRYPT LIBGPGERROR LIBXCRYPT LVM \ - LZO MDADM MULTIPATH_TOOLS POPT STRACE THIN_PROVISIONING_TOOLS UNIONFS_FUSE \ - USERSPACE_RCU UTIL_LINUX XFSPROGS XZ ZLIB ZSTD +SOFTWARE = BCACHE_TOOLS BOOST BTRFS_PROGS BUSYBOX COREUTILS CRYPTSETUP DMRAID DROPBEAR EUDEV EXPAT E2FSPROGS FUSE GPG HWIDS ISCSI JSON_C KMOD LIBAIO LIBGCRYPT LIBGPGERROR LIBXCRYPT LVM LZO MDADM MULTIPATH_TOOLS POPT STRACE THIN_PROVISIONING_TOOLS UNIONFS_FUSE USERSPACE_RCU UTIL_LINUX XFSPROGS XZ ZLIB ZSTD SOFTWARE_VERSION = $(foreach entry, $(SOFTWARE), "VERSION_$(entry)=${VERSION_$(entry)}\n") @@ -149,15 +147,15 @@ $(BUILD_DIR)/software.sh: cat $(BUILD_DIR)/temp/versions defaults/software.sh > $(BUILD_DIR)/software.sh $(BUILD_DIR)/doc/genkernel.8.txt: - install -d $(BUILD_DIR)/doc/ - cp doc/genkernel.8.txt $(BUILD_DIR)/doc/genkernel.8.txt + install -D doc/genkernel.8.txt $(BUILD_DIR)/doc/genkernel.8.txt $(BUILD_DIR)/%: % - install -d $(BUILD_DIR)/ - cp $< $@ + install -D $< $@ $(BUILD_DIR)/genkernel: $(addprefix $(BUILD_DIR)/,$(FINAL_DEPS)) $(BUILD_DIR)/software.sh - cp genkernel $(BUILD_DIR)/genkernel + install genkernel $(BUILD_DIR)/genkernel + +SHARE_DIRS = arch defaults gkbuilds modules netboot patches worker_modules install: PREFIX := $(file <$(BUILD_DIR)/PREFIX) install: BINDIR := $(file <$(BUILD_DIR)/BINDIR) @@ -172,13 +170,7 @@ install: all install -d $(DESTDIR)/$(PREFIX)/share/genkernel - cp -rp arch $(DESTDIR)/$(PREFIX)/share/genkernel/ - cp -rp defaults $(DESTDIR)/$(PREFIX)/share/genkernel/ - cp -rp gkbuilds $(DESTDIR)/$(PREFIX)/share/genkernel/ - cp -rp modules $(DESTDIR)/$(PREFIX)/share/genkernel/ - cp -rp netboot $(DESTDIR)/$(PREFIX)/share/genkernel/ - cp -rp patches $(DESTDIR)/$(PREFIX)/share/genkernel/ - cp -rp worker_modules $(DESTDIR)/$(PREFIX)/share/genkernel/ + cp -ra $(SHARE_DIRS) $(DESTDIR)/$(PREFIX)/share/genkernel/ install -m 755 -t $(DESTDIR)/$(PREFIX)/share/genkernel $(addprefix $(BUILD_DIR)/,$(FINAL_DEPS))