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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 64041138334 for ; Mon, 25 Mar 2019 00:19:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2FFEDE0A7F; Mon, 25 Mar 2019 00:19:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0716CE0A7F for ; Mon, 25 Mar 2019 00:19:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A12B2335D4A for ; Mon, 25 Mar 2019 00:19:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CF3A857D for ; Mon, 25 Mar 2019 00:19:06 +0000 (UTC) From: "Andrey Utkin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrey Utkin" Message-ID: <1553473078.47879bafb12ce8ca10959d2831f5090f8d89e679.andrey_utkin@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/raspberrypi-image/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild X-VCS-Directories: sys-kernel/raspberrypi-image/ X-VCS-Committer: andrey_utkin X-VCS-Committer-Name: Andrey Utkin X-VCS-Revision: 47879bafb12ce8ca10959d2831f5090f8d89e679 X-VCS-Branch: master Date: Mon, 25 Mar 2019 00:19:06 +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: 080213bc-6ad7-4bb8-885b-293e27a710b7 X-Archives-Hash: 920246c71d8328aea2380d7de772f11c commit: 47879bafb12ce8ca10959d2831f5090f8d89e679 Author: Andrey Utkin gentoo org> AuthorDate: Sun Mar 24 21:37:24 2019 +0000 Commit: Andrey Utkin gentoo org> CommitDate: Mon Mar 25 00:17:58 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47879baf sys-kernel/raspberrypi-image: drop pkg_preinst The first part of it is useless because it is about installing config.txt and cmdline.txt, which this package doesn't do. The second part is a check for /boot being mounted. This is done by mount-boot eclass nowadays. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andrey Utkin gentoo.org> .../raspberrypi-image-9999.ebuild | 23 ---------------------- 1 file changed, 23 deletions(-) diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild index dd395d591b0..a18735fa66e 100644 --- a/sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild +++ b/sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild @@ -19,29 +19,6 @@ DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt" RESTRICT="binchecks strip" -pkg_preinst() { - if [ -z "${REPLACING_VERSIONS}" ] ; then - local msg="" - if [ -e "${D}"/boot/cmdline.txt -a -e "${ROOT}"/boot/cmdline.txt ] ; then - msg+="/boot/cmdline.txt " - fi - if [ -e "${D}"/boot/config.txt -a -e "${ROOT}"/boot/config.txt ] ; then - msg+="/boot/config.txt " - fi - if [ -n "${msg}" ] ; then - msg="This package installs following files: ${msg}." - msg="${msg} Please remove(backup) your copies during install" - msg="${msg} and merge settings afterwards." - msg="${msg} Further updates will be CONFIG_PROTECTed." - die "${msg}" - fi - fi - - if ! grep "${ROOT}boot" /proc/mounts >/dev/null 2>&1; then - ewarn "${ROOT}boot is not mounted, the files might not be installed at the right place" - fi -} - src_configure() { :; } src_compile() { :; }