From patchwork Fri Apr 17 11:57:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1272203 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 493ZMp0w6Dz9sSM; Fri, 17 Apr 2020 21:57:24 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jPPcT-0000BQ-5F; Fri, 17 Apr 2020 11:57:17 +0000 Received: from mail-pl1-f175.google.com ([209.85.214.175]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jPPcR-0000BJ-H9 for kernel-team@lists.ubuntu.com; Fri, 17 Apr 2020 11:57:15 +0000 Received: by mail-pl1-f175.google.com with SMTP id ay1so903280plb.0 for ; Fri, 17 Apr 2020 04:57:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=60UJ6cOgHORzJZLPiwBYWRzcGIRkL9/YSzUOGW5p4x8=; b=X+cLu1iZHYvmm99GKQzAvLATP5aAZisZhCoUT4fidb4qYmxtfaQ9Ra7SmyMa+d2lRH iRQCHk5HlNhhq51i1RqTQ99nJg3c5jcNcLNeo3vMkWnz+rDI0cOZ0bHdZdzeRrE1sfx6 pM+sEyR0NmnqLHOSLhJk2ZEU1ZzvFGONrKq1JAsOLFdlwaFnOR6Yao180ownfBYyBdM7 qk5Mku2X+fj5P3aJH0d6fC2HaT2PBewa1ZzkLUSfdkrV1MZeSYgOATgLwf9cxuWfqNAJ 9seUnR0omRvJrDZcBTWpMMGFLkZC7G8/dlpKhJS/pS6tsZprKZLt1eRu5JoM+oiH0smf Q1DQ== X-Gm-Message-State: AGi0PuacYKvt+lSRpkeW426M5+2GusopPpwTkaznLLaNdY95lYCiQcYE pge2L+6aOQgAC6pTzHeUSVd78oODAcje9Q== X-Google-Smtp-Source: APiQypKkYvnZXpl3cgMkpIMYp30CbXBqkNp5cOyCHHpFTQdGzJRAzsqpg4Kff2pwGk6Q5GcyXaUN1w== X-Received: by 2002:a17:90a:e7cf:: with SMTP id kb15mr4038773pjb.146.1587124633638; Fri, 17 Apr 2020 04:57:13 -0700 (PDT) Received: from localhost ([43.248.18.109]) by smtp.gmail.com with ESMTPSA id g22sm5404717pju.21.2020.04.17.04.57.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2020 04:57:12 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [U][OEM-5.6][PATCH] UBUNTU: [Packaging] Include modules.builtin.modinfo in linux-modules Date: Fri, 17 Apr 2020 19:57:11 +0800 Message-Id: <20200417115711.102370-1-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Seth Forshee BugLink: https://bugs.launchpad.net/bugs/1873441 This is a new file generated since 5.2 (898490c010b5 "moduleparam: Save information about built-in modules in separate file"). Recent kmod versionss will try to use this file, so include it in linux-modules. Signed-off-by: Seth Forshee Signed-off-by: You-Sheng Yang --- debian/rules.d/2-binary-arch.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index b87214e7f124..ebaa1164b70c 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -347,6 +347,10 @@ endif mv $(pkgdir)/lib/modules/$(abi_release)-$*/modules.builtin \ $(pkgdir)/lib/modules/$(abi_release)-$*/_; \ fi + if [ -f $(pkgdir)/lib/modules/$(abi_release)-$*/modules.builtin.modinfo ] ; then \ + mv $(pkgdir)/lib/modules/$(abi_release)-$*/modules.builtin.modinfo \ + $(pkgdir)/lib/modules/$(abi_release)-$*/_; \ + fi rm -f $(pkgdir)/lib/modules/$(abi_release)-$*/modules.* mv $(pkgdir)/lib/modules/$(abi_release)-$*/_/* \ $(pkgdir)/lib/modules/$(abi_release)-$*