From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-we0-f175.google.com ([74.125.82.175]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1SB4Bt-0002Pc-0f for openembedded-core@lists.openembedded.org; Fri, 23 Mar 2012 14:06:01 +0100 Received: by wera1 with SMTP id a1so2633978wer.6 for ; Fri, 23 Mar 2012 05:57:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references; bh=63Dl1rPvUt+pzWouuIVt9QsihpwnyKQdtqebcW9XsvY=; b=me9QENvcho6PICYvEc5P4SoSbt9cdFzuBSW1FeupxF++S0haOHlxRQjBLW/d5DSGEQ oecq2AnIxyt14x6Dm6XcL4Y3mONN55LwHuy92QzgKjpeQYz7BO6cpKiA5zuyNWZPjdvr NdV8cSzWXQebhhbQWp3sLu3Tg6mgtx4BzNw21vY/W+oGS4R9+d3vrG82Cfv14hKzM2Lb 4RdNrspESEsKbM+xjNJcXyn1yZdKQ0pM0GssEOMDRDknSbiiubQw7dHAYWcKedw3enLi in4kPLnBLrjeXShbQj4GzmQ7uxlH17TQdEFwpj+1Kh+miFf5k6Wlbi7NC6635oAZgddU x1Og== Received: by 10.180.85.70 with SMTP id f6mr6463324wiz.5.1332507425096; Fri, 23 Mar 2012 05:57:05 -0700 (PDT) Received: from localhost ([94.230.152.246]) by mx.google.com with ESMTPS id fz9sm13678952wib.3.2012.03.23.05.57.03 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 23 Mar 2012 05:57:04 -0700 (PDT) From: Martin Jansa To: openembedded-core@lists.openembedded.org Date: Fri, 23 Mar 2012 13:56:30 +0100 Message-Id: <30ff40b68ca1bf9b04f5750e3018e6e50dfbf100.1332507302.git.Martin.Jansa@gmail.com> X-Mailer: git-send-email 1.7.8.5 In-Reply-To: References: In-Reply-To: References: Subject: [PATCH 5/6] update-modules: update script to read /etc/modules-load.d/ directory X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Mar 2012 13:06:01 -0000 * show warning for old /etc/modutils/* files without .conf extension Signed-off-by: Martin Jansa --- .../update-modules-1.0/update-modules | 14 ++++++++++++-- .../update-modules/update-modules_1.0.bb | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/update-modules/update-modules-1.0/update-modules b/meta/recipes-kernel/update-modules/update-modules-1.0/update-modules index 7ee7df8..14746d0 100755 --- a/meta/recipes-kernel/update-modules/update-modules-1.0/update-modules +++ b/meta/recipes-kernel/update-modules/update-modules-1.0/update-modules @@ -103,8 +103,8 @@ createfile() { $HEADER" # # Please do not edit this file directly. If you want to change or add -# anything please take a look at the files in /etc/modutils and read -# the manpage for update-modules. +# anything please take a look at the files in /etc/modutils, /etc/modules-load.d +# and read the manpage for update-modules. # EOF } @@ -161,6 +161,7 @@ fi createfile "$MODCONFTMPFILE" createfile "$MODULESTMPFILE" +# well we're using /etc/modprobe.d/*.conf instead of /etc/modutils/*.conf anyway.. for cfg in /etc/modutils/* $CONF ; do if [ -f "$cfg" ]; then # this check is necesarry to skip /etc/modutils/archs if echo $cfg | grep -q '\.dpkg-[a-z]*\|~$' ; then @@ -168,6 +169,15 @@ for cfg in /etc/modutils/* $CONF ; do elif echo $cfg | grep -q '\.conf$' ; then addfile "$cfg" "$MODCONFTMPFILE" else + echo "Please migrate your $cfg file to /etc/modules-load.d/*.conf" + fi + fi +done +for cfg in /etc/modules-load.d/*.conf; do + if [ -f "$cfg" ]; then # this check is necesarry to skip weird entries + if echo $cfg | grep -q '\.dpkg-[a-z]*\|~$' ; then + true + else addfile "$cfg" "$MODULESTMPFILE" fi fi diff --git a/meta/recipes-kernel/update-modules/update-modules_1.0.bb b/meta/recipes-kernel/update-modules/update-modules_1.0.bb index d9697de..2af75e6 100644 --- a/meta/recipes-kernel/update-modules/update-modules_1.0.bb +++ b/meta/recipes-kernel/update-modules/update-modules_1.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa RDEPENDS_${PN} = "module-init-tools-depmod" -PR = "r12" +PR = "r13" SRC_URI = "file://update-modules \ file://COPYING.GPL" -- 1.7.8.5