From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on sa.local.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-4.3 required=5.0 tests=ALL_TRUSTED,BAYES_00, RP_MATCHES_RCVD autolearn=unavailable autolearn_force=no version=3.4.1 From: antohami@basealt.ru To: devel-kernel@lists.altlinux.org Date: Mon, 18 Apr 2022 22:42:00 +0700 Message-Id: <28f172c59486e85b07771d2f764a3501b1705645.1650295032.git.antohami@altlinux.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [d-kernel] [PATCH 2/2] Replace devicetree from /lib to /boot X-BeenThere: devel-kernel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux kernel packages development List-Id: ALT Linux kernel packages development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2022 15:42:18 -0000 Archived-At: List-Archive: List-Post: From: Anton Midyukov To bootload with a separate patition /boot, it is required to devicetree on the same partition. --- kernel-image.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kernel-image.spec b/kernel-image.spec index da2739fc46df..ca6e562dfc81 100644 --- a/kernel-image.spec +++ b/kernel-image.spec @@ -423,13 +423,15 @@ mv %buildroot%modules_dir/kernel/drivers/media/dvb-core/dvb-core.ko %buildroot%m mv %buildroot%modules_dir/kernel/drivers/media/radio/tea575x.ko %buildroot%modules_dir/kernel/drivers/media-core/ %ifarch aarch64 %arm -make dtbs_install INSTALL_DTBS_PATH=%buildroot/lib/devicetree/$KernelVer +make dtbs_install INSTALL_DTBS_PATH=%buildroot/boot/devicetree/$KernelVer %ifarch aarch64 -pushd %buildroot/lib/devicetree/$KernelVer/ +pushd %buildroot/boot/devicetree/$KernelVer/ find . -mindepth 2 -type f | \ while read f; do ln -srv "$f" "$(basename $f)"; done popd %endif +mkdir -p %buildroot/lib/devicetree +ln -s /boot/devicetree/$KernelVer %buildroot/lib/devicetree/$KernelVer %endif mkdir -p %buildroot%kbuild_dir/arch/%arch_dir @@ -592,6 +594,7 @@ check-pesign-helper %ghost %modules_dir/modules.symbols.bin %ghost %modules_dir/modules.builtin.bin %ifarch aarch64 %arm +/boot/devicetree/%kversion-%flavour-%krelease /lib/devicetree/%kversion-%flavour-%krelease %endif -- 2.33.0