From patchwork Fri Feb 2 13:35:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 195863 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:9bc1:b0:106:209c:c626 with SMTP id op1csp429809dyc; Fri, 2 Feb 2024 05:35:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IFcq125ls7m88TX6vEYHIi2ADcJA5q/uQAePgl/oxclvAtlm5Thrh1zq3J32eiwAecXO5SG X-Received: by 2002:a17:906:494a:b0:a36:c276:c3ca with SMTP id f10-20020a170906494a00b00a36c276c3camr3462651ejt.6.1706880955727; Fri, 02 Feb 2024 05:35:55 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706880955; cv=pass; d=google.com; s=arc-20160816; b=mtDgkGzt4WjgMx/PjJ5QH5sH1nUbGITXsL66z+QuisI15+Ja2HpvVKxNma25AlkjZX VeiiEsv3O+n6SCtgkkXwdssu9f+QuuLN0f9XdKRf4xb8W9O9VwLNTZEfsqm1NDiMSoCu CjnELqlTDgGOOj1PnvToM5nkF2npnc/wiz1FybjlG8rfnBo8M3k4rcOAgfJmmxANSjHe 2UVLjJEGkqy0N/AyU0gP0q0MARC9uNytpEx09X9TJFrGb4DEEhx3pcDxqFotZCK0QcUW kRQ0FoK5e0dNlFLl/wg6z94qWoMhJVI1nPtWXV6mvnRmEqIN9+6oaY357Impuq3ySsfA PkcA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=6Rnx9nu+vhOuZfQSLmGIry1m7ALm/JSk9kPP9WdMsPM=; fh=jagLYAb8PgzL5kbgO1cvQ5W2D3qaPeuwD177Nvcl+U4=; b=fSJMjQcaXnsLZA5MzN0dki4OFlZBKllttaV1DSb/yjjpLWmBhU1+EUPpqiQN6jefsB QzR9SKk1NS3hAUS0PGzNumL85ibFeW63bdnhp3sPXoX0TCyQ2hy1acVhXjrQwyWpBcce ztcCT2kuD7xfKIAhnCh5gbQNKopzEC7pQTLtC+VwJkN1hIgEXr1K1RJwZTIIXvgXyESN Jqjd13C4ZVgKtIjUHkZUwrfrAkDog10PUZ/ANuQkRyHGM2aL31NNa5p/qGWUifs5cKtw 6Ki6w3MAvQ+9hPN6fHlxLSuC3ur4ncM3HkeJFhTRc+XH3UVmYEsePnDz66j/xfK4x6a2 7fNg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=PmN7xeAD; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-49904-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49904-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Forwarded-Encrypted: i=1; AJvYcCWwgTdsKgrASTQnepF9ctiG58b2Bwcl1Jr7QzIzI3NCH9tLB4FcXe/9n4HMDH80sDFxYu8GCsng9cmTf8DumgILtIfTwQ== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id qh8-20020a170906eca800b00a36c46652ebsi825469ejb.502.2024.02.02.05.35.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:35:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-49904-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=PmN7xeAD; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-49904-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49904-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 4B7F81F279B4 for ; Fri, 2 Feb 2024 13:35:55 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2EDEB5A4C2; Fri, 2 Feb 2024 13:35:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="PmN7xeAD" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 74F924655F; Fri, 2 Feb 2024 13:35:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706880927; cv=none; b=u9j2wXOdveH6hkU8um7zbewkXwNxLNIXHXY+WmN06mlCooLCGCePI13jyj/HtSn8sIUh6I421Hp1+qrEgJFKmJlUSu8uyNCqAL0zCpT9pn9u58Ybj8lgLUdtlRWYhDExQ1iHNsj08R7f9z68VVXNdiJH8yNS6qMgfoinpweApLk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706880927; c=relaxed/simple; bh=RKMOk0rYR3IGINlpmA2Z8cdwjH0dlA8ns+BK0/KqDhQ=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Qkb/qemZcN2jPAYHgKsmGGNtRyXJQ+LH5lcv4ro+0DskQEx1WyNKlfs/xue0IlldpvW+lBEqo10AY/2K4Ky+jls+nIHeHiTzUuEpV+0Nqwnx7+TfpP/8cBfyLtigNQ/vU+0eF9RhNHiEkoMUvHagh+pW4Zt6Q3HQUohZiEOty44= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PmN7xeAD; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 151F8C433C7; Fri, 2 Feb 2024 13:35:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706880927; bh=RKMOk0rYR3IGINlpmA2Z8cdwjH0dlA8ns+BK0/KqDhQ=; h=From:To:Cc:Subject:Date:From; b=PmN7xeADdgyThbN7l4XKfqTgeB5HRIhIwfK6MGIj/wMB2Gzx8p4vd6jPX50FtHTjk 3gXfTRHzFrUEGlX61XMOKZRHol/iKQX9KIz6LL+8UQ9Ixv88/iCOqln2zDa8ijfjQR saGUs8jNuaA03bFRDUuw/NuuLSm3J/kzXg2fFEyR65SuPeSPRUZEQi1NdY3fw+Q+ce 1cscWfbqheiBklAi2zFpfruIrYoY+LApEe0rmKwEnfmz3WdnseHZrbRmroWvz+f7k4 Sa0hKmese3nNXWu3+r28Oz6AzCLtKO1Z6D82itcIO3yC/HG8BrE4EK+I2WlanjNXVf TlKnuFhDLChww== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Nathan Chancellor , Nicolas Schier , linux-kernel@vger.kernel.org Subject: [PATCH 1/4] kbuild: rpm-pkg: do not include depmod-generated files Date: Fri, 2 Feb 2024 22:35:17 +0900 Message-Id: <20240202133520.302738-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789794404776361717 X-GMAIL-MSGID: 1789794404776361717 Installing the kernel package is fine, but when uninstalling it, the following warnings are shown: warning: file modules.symbols.bin: remove failed: No such file or directory warning: file modules.symbols: remove failed: No such file or directory warning: file modules.softdep: remove failed: No such file or directory warning: file modules.devname: remove failed: No such file or directory warning: file modules.dep.bin: remove failed: No such file or directory warning: file modules.dep: remove failed: No such file or directory warning: file modules.builtin.bin: remove failed: No such file or directory warning: file modules.builtin.alias.bin: remove failed: No such file or directory warning: file modules.alias.bin: remove failed: No such file or directory warning: file modules.alias: remove failed: No such file or directory The %preun scriptlet runs 'kernel-install remove', which in turn invokes /usr/lib/kernel/install.d/50-depmod.install to remove those files before the actual package removal. RPM-based distributions do not ship files generated by depmod. Mark them as %ghost in order to exclude them from the package, but still claim the ownership on them. Signed-off-by: Masahiro Yamada Tested-by: Nathan Chancellor --- scripts/package/kernel.spec | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/scripts/package/kernel.spec b/scripts/package/kernel.spec index f58726671fb3..aaedb6d1b26f 100644 --- a/scripts/package/kernel.spec +++ b/scripts/package/kernel.spec @@ -66,6 +66,20 @@ ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEA %{make} %{makeflags} run-command KBUILD_RUN_COMMAND='${srctree}/scripts/package/install-extmod-build %{buildroot}/usr/src/kernels/%{KERNELRELEASE}' %endif +{ + for x in System.map config kernel modules.builtin \ + modules.builtin.modinfo modules.order vmlinuz; do + echo "/lib/modules/%{KERNELRELEASE}/${x}" + done + + for x in alias alias.bin builtin.alias.bin builtin.bin dep dep.bin \ + devname softdep symbols symbols.bin; do + echo "%ghost /lib/modules/%{KERNELRELEASE}/modules.${x}" + done + + echo "%exclude /lib/modules/%{KERNELRELEASE}/build" +} > %{buildroot}/kernel.list + %clean rm -rf %{buildroot} @@ -78,6 +92,9 @@ for file in vmlinuz System.map config; do cp "/lib/modules/%{KERNELRELEASE}/${file}" "/boot/${file}-%{KERNELRELEASE}" fi done +if [ ! -e "/lib/modules/%{KERNELRELEASE}/modules.dep" ]; then + /usr/sbin/depmod %{KERNELRELEASE} +fi %preun if [ -x /sbin/new-kernel-pkg ]; then @@ -91,10 +108,9 @@ if [ -x /sbin/update-bootloader ]; then /sbin/update-bootloader --remove %{KERNELRELEASE} fi -%files +%files -f %{buildroot}/kernel.list %defattr (-, root, root) -/lib/modules/%{KERNELRELEASE} -%exclude /lib/modules/%{KERNELRELEASE}/build +%exclude /kernel.list %files headers %defattr (-, root, root) From patchwork Fri Feb 2 13:35:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 195864 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:9bc1:b0:106:209c:c626 with SMTP id op1csp429941dyc; Fri, 2 Feb 2024 05:36:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IH50R7YEkbPdjk2Ixrmz8773XyBfaWRV9eDAPGEH8gGILknL47Fa8AxmCLTzB7Zsg9QNFRU X-Received: by 2002:a05:622a:507:b0:42b:f858:76e9 with SMTP id l7-20020a05622a050700b0042bf85876e9mr4042778qtx.47.1706880968413; Fri, 02 Feb 2024 05:36:08 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706880968; cv=pass; d=google.com; s=arc-20160816; b=GgBwcOSI97E9VtLFXffzRKwn79OevzwMIYsgzSFU8feeATx5C3RFf1dbky7uTn4ubv npkfo3nzRWXpjQDOlgfBQfUbFQAHmwmjxq4sVgo0cZ67FpDA/uCssRcLKEjuNYuBjD/p TH1zfPVb4Y+ZetnqE1UiQwbl/4nHq6FKySX7Z8ZT5f/u0UWmBTjC4afZvrqwGU9mR2lK kMceSfmLtXEp+Nj6rDhY98l7vH3kdYgi9etQt9CwaTC/6ogp+DIN5AIDtKvXwW4AQnOl wuYwtyOPMKiL64cPENzo81b1icbkLyGWseKQQcdu2x2/X3IqwxUzl1XDcSfVuduHXvXG P4+A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=HGkAyCRP7B9cfybhImmaLOg8AVUtBK2ZkTCrL27pwKM=; fh=PilnAi+Lou/GM6CHalhgzKzhRgJ3sNKMukMFLDHFCHw=; b=Pk8VDBsQJjOZ752D3YCC0qasQEwidkg5Rkm0nqy5WfaAVy0+R6j8tgiK3XqFQ25AGO EXG3cdP0zp544uaDrEiw024D1NBz0ZpSZhOoUMa6qv+85etuyr/Udzo/MvRzC/q5mGUN 72dklsyWTntaaTY7xGM3mm5N5h55NG2tcPxX1jIczdAkDGx19NsPKNMxbF9Ux1wmCrx7 PhV6OaK27fLzoKsB+vfLizM1KwsRymhLrRu5Mrd57ps7Rh6wkWhiy/xwP2RCdFpdJaZ9 R1kcMfrpkOZNX26P1/p+KyN886Mauqjh77T3qyitYBBMxbgjH6uUE+UjSQSw8hmvEvdB 7ouw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XRLSM7mY; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-49905-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49905-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Forwarded-Encrypted: i=1; AJvYcCUULf419ZMWjZw+G93GukxIePpNsOhdIwbpLzmEuxHHZU2Au2ISq1VzeyBKlM0LdjbiLgZZ3NxawfQGDf3vOxZatkwisg== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id l6-20020a05622a050600b0042bff2835b8si1959491qtx.579.2024.02.02.05.36.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:36:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-49905-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XRLSM7mY; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-49905-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49905-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 36FE91C25D42 for ; Fri, 2 Feb 2024 13:36:08 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6C64D140771; Fri, 2 Feb 2024 13:35:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XRLSM7mY" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B14041E4A6; Fri, 2 Feb 2024 13:35:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706880928; cv=none; b=kKZK8CLf62vMMo4nF0fiq9HYi/6hulrZHdl6xtLyuvROjRajgttFQ4X4AY0DknzkqLwEBLO4QvXGUKoqxMUEB0BuiEiWIUOjdfjuc8Jy5Feoj+nX4emjajY0C0JDN6oVNwdlVvIEWIqu7Mw6Id1EmNgvLUf/q/FKAjH+kJadGIc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706880928; c=relaxed/simple; bh=7eFQengerwA9drGKbBSRiI3jh5gQkIy0/WN8yF4kW5A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bDAirjA0h5S9Ll4XyPNoCSJDuyEEVxqTzXuoqM1D6AiG79/k0gqgI6m6otbzpbFhlVgduMxDWPSIfrDp217gHDaBY9uwIQDifTCCWf1MXeLCUFCwLoVLMZwNDtlotYx5VYcBRcRp0IDk+zRYOfsFb7YpuYzrNd8mGnMvsstUxKg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XRLSM7mY; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A3B1C43394; Fri, 2 Feb 2024 13:35:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706880928; bh=7eFQengerwA9drGKbBSRiI3jh5gQkIy0/WN8yF4kW5A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XRLSM7mYYOf+1dV6jtbbEtoEV813bFXK7NmK4Mcvj9CpQvCjMKLfsC/R1Oo34SkkV MYnB/WaBRQATuooUF1RokGWwLbY9pRS3KDISENNZVwRG+F9KhDFxUgs3vwa0rMuB+9 bktrA1tFVleEDBF/6DXVqeUmgyUmbIWiffmPAovpczR2XKwc+H+F/ZjlCa4usM0Omk BpYhAH41HlbJsxrujtWts2EJ+5xAcTUetVAyvlR0d1lVq6Sf1qR+0pu3aZ/uuzKgWi ImHgaXjS2tt6uqlUSBwTJHXdNRh2TXNr0b/yBtXz6vToO41rr3hie4TedwZ1XCQhfB MCUCyBzHXcjiQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Nathan Chancellor , Nicolas Schier , linux-kernel@vger.kernel.org Subject: [PATCH 2/4] kbuild: rpm-pkg: mark installed files in /boot as %ghost Date: Fri, 2 Feb 2024 22:35:18 +0900 Message-Id: <20240202133520.302738-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240202133520.302738-1-masahiroy@kernel.org> References: <20240202133520.302738-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789794418182573378 X-GMAIL-MSGID: 1789794418182573378 Mark the files installed to /boot as %ghost to make sure they will be removed when the package is uninstalled. Signed-off-by: Masahiro Yamada Tested-by: Nathan Chancellor --- scripts/package/kernel.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/package/kernel.spec b/scripts/package/kernel.spec index aaedb6d1b26f..ecedcfc11e73 100644 --- a/scripts/package/kernel.spec +++ b/scripts/package/kernel.spec @@ -77,6 +77,10 @@ ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEA echo "%ghost /lib/modules/%{KERNELRELEASE}/modules.${x}" done + for x in System.map config vmlinuz; do + echo "%ghost /boot/${x}-%{KERNELRELEASE}" + done + echo "%exclude /lib/modules/%{KERNELRELEASE}/build" } > %{buildroot}/kernel.list From patchwork Fri Feb 2 13:35:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 195865 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:9bc1:b0:106:209c:c626 with SMTP id op1csp430282dyc; Fri, 2 Feb 2024 05:36:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IHxwsyPFc8rbd6eNPQtn9JoHXwFN6A/iHm3+uNZjkrvSP0vOG1F57vYzea1iHhj2fnzg1JF X-Received: by 2002:a17:906:e246:b0:a36:598b:e291 with SMTP id gq6-20020a170906e24600b00a36598be291mr5889060ejb.26.1706881009534; Fri, 02 Feb 2024 05:36:49 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706881009; cv=pass; d=google.com; s=arc-20160816; b=gxkml/TW1GJpKBN2wocB/H3vJUqKGQPCgkdwMjBQgs9s7vleLHnQyuYMpYjKr5uEmW DFc6yCQafF0X/2P11aEZdoUDMNHVxZ5ZPds3bznoHaT2H4L6lzFObYMqPlHvMdoapBMD Eqe63ssNyjFiqeBzlFSbDmRXUdhWGlDpPjDPZXAAlYIuo0sx6mfk4ynU5tmLFdTWks/f BxfYFInYQ9gL+3x6ukxaZbuVeOY7gG1qy+ISGUHB4SGiEIRQZbiNxxehzlfH+V2DRwtD o29vQ0P/TLZrRwJjw4jHIjW1vSw/jB0yfyq5h78JBu8Ve4cNCEY9A63wwLwLXIOjRCqC MTSw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=TyWmCE0uCtJVJwt0GOpvjFFUZu90+pijs1A/pBqAcac=; fh=zuIMrDkoI2wpLGG7oJuZnBNOAL2zytAPUADWtktMbJo=; b=ObRZGaV89vn7QuxOv4tZTKiRNhrTj4mKtTejve747s/sr9vTYJynPmulVZr9sCicc1 21ikrqlPvfOGSpbN0N2sEsqHTmiedl6lvZigC1HgRi9UfQdwONVu7PqDaEy3rXVcEgq3 bc/ePFjgmiURbKYweI4MY6QmKuSTI9Jsij5Ox/ybo6lFfT6BLnSkmc16yGvvXVCC94Bp mzkrBYCvQ/3pJpBFZW7mLzp7/HX4k/KZHXDcpZWZmPwQFn/dQYu8dfbLOAp7xxP/QC6q 3qAedJ7tJHUufqD/6QixCBF87eV+5JXtqtDu/UCChvg9qmfFg/OVMfQZQxF9o7lMMHTT oeTA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VTRodOTz; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-49906-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49906-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Forwarded-Encrypted: i=1; AJvYcCXRhAPByjXBlpDw/XstIkrXxqvCrucL8NzmXXS1d8s2+8LUnsKTZ+WsdC/Tnw8uiqfXUdlOFS0gOPoZjl74S0+XAvInmA== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id ck15-20020a170906c44f00b00a36f9e61667si773543ejb.914.2024.02.02.05.36.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:36:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-49906-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VTRodOTz; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-49906-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49906-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 96A861F2B327 for ; Fri, 2 Feb 2024 13:36:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2020D144636; Fri, 2 Feb 2024 13:35:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="VTRodOTz" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6676B60249; Fri, 2 Feb 2024 13:35:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706880930; cv=none; b=DViYL3lo/niD85UY3OOaeh5gaS+4EGqUaaKgMCyep9gvWU4my49mEGHTzJfsdYjeUg1awprt1d7kurLhS2EBCjNkMDN/Vrd0e9lzfWpL5mhTorSPW6BXu0d9IUnixx3jatdiw8ucSEoGkgFtAGnQjdHPoZvi8OPVvp5pp8pW9SU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706880930; c=relaxed/simple; bh=K6THucq1Y36mjX1mtaVBB8G3stK33EV44ZYVaZxE6qM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=a5sbbmopCZA1ydvN7iS+WJs27edghEB8V9VPfHJ6gm/0O+btwGXLns/3giuPiI3gN6kkeAeiNZqs1E3pN/wJirL7KsIfuMYu/VqcFNjFNRDVCT0xpripcDaZ+HRm8+18L2uioLZ5F5x/4LmvxyfQR+qvhduqFqJ69emH0ZW4Vog= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VTRodOTz; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id F1525C43394; Fri, 2 Feb 2024 13:35:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706880929; bh=K6THucq1Y36mjX1mtaVBB8G3stK33EV44ZYVaZxE6qM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VTRodOTz25bBMg9dt1yMLRJ3+YxQ+CO5lRLU9KR+IXHRBEaqEVqK5H2LrBtzcKJTY IGXcZzof9ZstcCQUBorzavfa8x8coAOwES6EkkZ6JrIBHmUEwH8pa/3ztbj9lZ1lPq /BiXHn7gFbuMsG0R/1TTI7Am+58h8RYbgLCXSCoG49rEfryZhY7N7VpiNERlTjplB0 Rx8q6DOdmiWeuvgb3Oa3Qbk+8r5LDNxEUv9MQPxP+/OMwg+kXk6X1zF2+QRQ5Ccn6Z yvdmPOK7cH0a4Ptz6/rbYE1z0kdet4ukcmkGoz/uy00av3vFr4Fjwf3wZUTNUINzKr qlTKPUmZTtmiw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Nathan Chancellor , Nicolas Schier , linux-kernel@vger.kernel.org Subject: [PATCH 3/4] Revert "kbuild/mkspec: support 'update-bootloader'-based systems" Date: Fri, 2 Feb 2024 22:35:19 +0900 Message-Id: <20240202133520.302738-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240202133520.302738-1-masahiroy@kernel.org> References: <20240202133520.302738-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789794461509272878 X-GMAIL-MSGID: 1789794461509272878 This reverts commit 27c3bffd230abd0a598586aed0fe0ba7b61e0e2e. If this is still needed, we can bring it back. However, I'd like to understand why 'update-bootloader --remove' is needed for uninstallation, while 'update-bootloader --add' was not called during the installation. Signed-off-by: Masahiro Yamada --- scripts/package/kernel.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/package/kernel.spec b/scripts/package/kernel.spec index ecedcfc11e73..c1b745967f64 100644 --- a/scripts/package/kernel.spec +++ b/scripts/package/kernel.spec @@ -107,11 +107,6 @@ elif [ -x /usr/bin/kernel-install ]; then kernel-install remove %{KERNELRELEASE} fi -%postun -if [ -x /sbin/update-bootloader ]; then -/sbin/update-bootloader --remove %{KERNELRELEASE} -fi - %files -f %{buildroot}/kernel.list %defattr (-, root, root) %exclude /kernel.list From patchwork Fri Feb 2 13:35:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 195866 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:9bc1:b0:106:209c:c626 with SMTP id op1csp430297dyc; Fri, 2 Feb 2024 05:36:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IEvduTzW7obv6F3BsbDMbXnXCXD7FRNXpgX7iRVwqFL2JBwHrAb5sXo6V5cIF1IzEjVWkaz X-Received: by 2002:a17:906:598:b0:a36:c489:7cba with SMTP id 24-20020a170906059800b00a36c4897cbamr3496654ejn.74.1706881012634; Fri, 02 Feb 2024 05:36:52 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706881012; cv=pass; d=google.com; s=arc-20160816; b=B9f/99I4hOeD0VihdVdkY7Pc6Mmk23vhZoeaC/G2lTohrHDSAhu+8Vnb5ztLBeK+AM R1mDyb5yyIFayxmh1rFaGPbHjINXP5FVLu92EHGOyCmcmv8uIru2cRSTw4lIeZUsYTqw or+26hjlLkG86AHAMLRr9+1vEUpe/P6ZTsXYkjtM5mO25U2vO1Jj60m0DLvu7eH5Sy1s l9dao1zmCdxOP3G9H5gCCLJ3OVV2IthIW94eeiESUYi4uX7B2u5vegOTZ5LJ6EFIZBl2 pOcWkGCUR2A3fdhtID4lbnwAF8PhkqsDnVv/eQ2dTofZ5oodVT6qBDbPXD+PEP84iT3j c+Dw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=kOa6lQc5BwC7V1LC2iSo0L/axDHEfh8Kzyajz+jlTsc=; fh=QqGTIzJIbyKKiLhk9uQVxvodsl/e4qzE71KmDNK3KBk=; b=czo0meuNY1lHAnkfZ9B0bCKJUuGEpuLaTt7HGVeCgXB4EqYcltxW9TUrzUp4Dkc13Y wpGPH56Ntp2P2zCgrXMlYN18mX+HmoTLUnerOqsNrTpxEY6bNfk8FHus+aTe7l2W59+p hfTXNXaJtEyOj0jWZgYKyDJ9P0wD6Xfhtx7ZilU2Kl0u9SX+I0XfEaLIXHSMtvM7P1NL iUN4m1sqTzgUAHqp8Dg/KKLRSVmiaUDmLJ82g+H3RutwXLpdyCxDR4aY+SaYI/0eZnkE /rx0PuC4B0yU7NutjTftqRQevsZbS45+1lZk3OA5T5ifgcFu0vmXiccmlJrHws605ECB I6TA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=o9wTjFPF; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-49907-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49907-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Forwarded-Encrypted: i=1; AJvYcCVG2aVMT4+pxPMNbYTezL+E2hMUzvATMwHIrJOpfQ8tmQ/n/PquN7TKzbdYR7f1Z4kuUMhSq3ufKT+YN+3E26KZGvRH+A== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id x18-20020a1709064bd200b00a3599b5fefesi854205ejv.194.2024.02.02.05.36.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:36:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-49907-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=o9wTjFPF; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-49907-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49907-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id DEDC41F2B767 for ; Fri, 2 Feb 2024 13:36:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 676B2145341; Fri, 2 Feb 2024 13:35:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="o9wTjFPF" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C35601419B0; Fri, 2 Feb 2024 13:35:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706880931; cv=none; b=Asuj2kGush6IkkAaYbLGTtSdhTPDhlFy6r552wodT8zsIkykBDiygeu7HLDHfL6UTOQQeSYmXnEWgb0DOiyV2Auem64shf9xzaR8NqjUJYRhcb4yWK3p2GDP69bbvT766f/tluvGGdY5w7xqMjLvY+5eDwEdaGIuddQiqUKktfU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706880931; c=relaxed/simple; bh=kEo4j6RbGBwDkaFpN5XVSmcWPQCgDr626mH0ogy5qbs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VTxc0neANVfYn87TPZOb34IvFKNs8JSJudYpwXjAd2x2QEdBkZMnVdN0svFtzn+n0ew84FHqYAkGjuk+J9S6icqFFwydLgfdsIwDjvQbLy7xrKZhiUY7nQBi4lX3hnkqQScb3Rh/X6+yRNLNanhrORh8d9R4WieugoIDwF+CjBE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=o9wTjFPF; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5833DC43390; Fri, 2 Feb 2024 13:35:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706880931; bh=kEo4j6RbGBwDkaFpN5XVSmcWPQCgDr626mH0ogy5qbs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o9wTjFPFPUJZK+qU5vDxPrIjjaDRM1wdNAawh31g3gXI9yurFsRiN/HBPEGxELIvY 9jikLJsYmkoG5bwzv5TCpYgwc6Kz9K+MpaedtrlvHjO2cQrp9s2MkrXTJ6saCjGUMR EPXBmw6r6sTPzoY6ebxDZcnYdA46KIkVUUKiURoxQDvj36fiCQs0J6E72Xe0cdS7H7 SKodssaWEDeF9AbuLWHiC0COSXjep14e+0e7MVh2Em7QWxmWBaf82sl3LAE3Lrya2j 9HQ1S7hJNLZuuSi+Sz6SAzv58SSRztDl8mmcSomkIeS1PBHOKLUxhVlEVJ/7jCKNRb Wq9+aaWA6wPag== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Nathan Chancellor , Nicolas Schier , linux-kernel@vger.kernel.org Subject: [PATCH 4/4] Revert "kbuild/mkspec: clean boot loader configuration on rpm removal" Date: Fri, 2 Feb 2024 22:35:20 +0900 Message-Id: <20240202133520.302738-4-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240202133520.302738-1-masahiroy@kernel.org> References: <20240202133520.302738-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789794464787857112 X-GMAIL-MSGID: 1789794464787857112 This reverts commit 6ef41e22a320d95a246d45b673aa7247cc1bbf7b. If this is still needed, we can bring it back. However, I'd like to understand why 'new-kernel-pkg --remove' is needed for uninstallation, while 'new-kernel-pkg --install' was not called during the installation. Signed-off-by: Masahiro Yamada --- scripts/package/kernel.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/package/kernel.spec b/scripts/package/kernel.spec index c1b745967f64..c256b73cca3e 100644 --- a/scripts/package/kernel.spec +++ b/scripts/package/kernel.spec @@ -101,9 +101,7 @@ if [ ! -e "/lib/modules/%{KERNELRELEASE}/modules.dep" ]; then fi %preun -if [ -x /sbin/new-kernel-pkg ]; then -new-kernel-pkg --remove %{KERNELRELEASE} --rminitrd --initrdfile=/boot/initramfs-%{KERNELRELEASE}.img -elif [ -x /usr/bin/kernel-install ]; then +if [ -x /usr/bin/kernel-install ]; then kernel-install remove %{KERNELRELEASE} fi