From patchwork Sun Jun 25 18:16:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 112677 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7049772vqr; Sun, 25 Jun 2023 11:52:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ71k33ZySW8+baAeDxMyeSmSQ8HuIdyFo7qKDrCGiyy4ns2/gUOFKSXNGezk5TBx38WxArJ X-Received: by 2002:a05:6402:1654:b0:51d:897b:b754 with SMTP id s20-20020a056402165400b0051d897bb754mr2224765edx.37.1687719124620; Sun, 25 Jun 2023 11:52:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687719124; cv=none; d=google.com; s=arc-20160816; b=Sbs2zTmyT5C/teLkZeK5ovQ325MSf3KoyaGBvRYjPpYuM48rBljozwxjkMqsKPAZFi HcEpcdGZBenYDoPoppxMCQMctKhLsEoJYRUbmD03V8eSA3l8owOzFI6pgKxQSfrCCkpb OOL/nwQEsrWe99s7v0fX0GQzTqT1mEwlj/+mrdKVbxquH23cJENb5bb3kVsFmJL+eHDg td+T2LHdiULp5wSNtXLO8F/Sf6dFjkeE4RacCK2NA2Bs16XuRNA5kX7m3u0GAL06HBmR o+VSjvXm4YpDennjzlYWk/zQAXKsvCzc/zlP6IHWj2DNbDKG4xINsWfn1uWgrOcb6Y8a KRpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=+wAMqfY6kVnf4bCsxnTWnwMEd3mwIR0g6qKvgOXTSm4=; fh=hkw5vPqLMl7NhphOGLy+2WRStjya7kPCg3EKbiT+1OQ=; b=BcOVSWIW09J9hd3On3V4j4doI5kuFnDFg77LP4vwhYtThC/L0wqocKbmj9Cvu2CTHm iSos0vaJkrwFZY7xOkAMVAHMjMgdPve+F6M0ldPLMarXIu1yEYEwwHxaVhyhS8nn/c+N QqUi4UuLi5e57u0MhctzNZEmdP96F8hoH7OIxgtF8gti/Ftbnr3zSqub9A/8WKSZkRU0 1t/MXjCjOa9I5VMt+4c/vl7k3BvrM9bjaGu0Gjd/xQT8gWKCFxx+sq0z0L8zdinT4KO8 KlsUHMpV8+t65KioNo9B+1aTQfl2QJL+j/mTYvapCp8yw+drTMqbAevmbcWoTIbsEBLN mXSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ABISlHKj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g21-20020aa7c595000000b00516575b1ca4si1880548edq.38.2023.06.25.11.51.32; Sun, 25 Jun 2023 11:52:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ABISlHKj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229639AbjFYSQh (ORCPT + 99 others); Sun, 25 Jun 2023 14:16:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229454AbjFYSQe (ORCPT ); Sun, 25 Jun 2023 14:16:34 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A2C91B9; Sun, 25 Jun 2023 11:16:34 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (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 dfw.source.kernel.org (Postfix) with ESMTPS id 893AD60BFC; Sun, 25 Jun 2023 18:16:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 20F47C433C0; Sun, 25 Jun 2023 18:16:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687716993; bh=n9VaGSVflGs2NZDQUV1xewtUL+wrQ9Xx5IQp2n1jwAY=; h=From:To:Cc:Subject:Date:From; b=ABISlHKjVWp6QGmiA4Utc6/kxfr7dMWP5j68xqZXgOQTOfKr7XY95IT4OWBXyHFYG D6eZVM6E2mj82/0mwhMPz9oErzt+CIctzSLCX74LSgSuoQt91ZWiF6pJEE4IUF2YMC oG8XBBXfY/Z5PEiI78ni/5D/U5Gsby+dwOfh3tXkeQgOFiJHFdFMjScOb/yl99SM22 CsuLs3OL1dZcDrvGXY249cfQayG1Tg9s+/qqWquKONlTUYmeiJ1aXvqaPDDkbc3bQq ANWhMuhKIaZFRoN9iarg2pN1lWmGHQtoAactpS6DbrYsp3f15RNpj8Ujkh/lkspDpW Un6Aq9leNNeCA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Josh Triplett , Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier Subject: [PATCH] kbuild: deb-pkg: remove the CONFIG_MODULES check in buildeb Date: Mon, 26 Jun 2023 03:16:23 +0900 Message-Id: <20230625181623.2473308-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769701768917665040?= X-GMAIL-MSGID: =?utf-8?q?1769701768917665040?= When CONFIG_MODULES is disabled for ARCH=um, 'make (bin)deb-pkg' fails with an error like follows: cp: cannot create regular file 'debian/linux-image/usr/lib/uml/modules/6.4.0-rc2+/System.map': No such file or directory Remove the CONFIG_MODULES check completely to always create the directory ${pdir}/usr/lib/uml/modules for ARCH=um. Fixes: b611daae5efc ("kbuild: deb-pkg: split image and debug objects staging out into functions") Signed-off-by: Masahiro Yamada --- scripts/package/builddeb | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index e3109e67c33e..bf3f8561aa68 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -63,17 +63,13 @@ install_linux_image () { fi ${MAKE} -f ${srctree}/Makefile INSTALL_MOD_PATH="${pdir}" modules_install - if is_enabled CONFIG_MODULES; then - rm -f "${pdir}/lib/modules/${KERNELRELEASE}/build" - rm -f "${pdir}/lib/modules/${KERNELRELEASE}/source" - if [ "${SRCARCH}" = um ] ; then - mkdir -p "${pdir}/usr/lib/uml/modules" - mv "${pdir}/lib/modules/${KERNELRELEASE}" "${pdir}/usr/lib/uml/modules/${KERNELRELEASE}" - fi - fi + rm -f "${pdir}/lib/modules/${KERNELRELEASE}/build" + rm -f "${pdir}/lib/modules/${KERNELRELEASE}/source" # Install the kernel if [ "${ARCH}" = um ] ; then + mkdir -p "${pdir}/usr/lib/uml/modules" + mv "${pdir}/lib/modules/${KERNELRELEASE}" "${pdir}/usr/lib/uml/modules/${KERNELRELEASE}" mkdir -p "${pdir}/usr/bin" "${pdir}/usr/share/doc/${pname}" cp System.map "${pdir}/usr/lib/uml/modules/${KERNELRELEASE}/System.map" cp ${KCONFIG_CONFIG} "${pdir}/usr/share/doc/${pname}/config"