From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 38890E00BBF; Mon, 22 Feb 2016 08:57:18 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low * trust * [74.125.82.47 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily * valid * -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com [74.125.82.47]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 2E791E00BAA for ; Mon, 22 Feb 2016 08:57:15 -0800 (PST) Received: by mail-wm0-f47.google.com with SMTP id g62so182869153wme.1 for ; Mon, 22 Feb 2016 08:57:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-type:content-transfer-encoding; bh=+c29MsZ95foMgtQoOh2Mggmb0Rzbdp+kZEYGC7ZdScI=; b=yV/+YP05euwOdboBxCbgHi/5fgq7GnG0SdPJmeg4h/hfSZdT5yytli+N72/unr2Ef9 isLBSreIEF1HISyI4BUKUOIWoPegznK3XJ7sq0Jk/1x38GznY2srrhK9vVSF1UoqVPyK 4kvkzjsAxWkCN52rwuowIWmRhCVfw9sHkrINM5Rd5+clH6jAz9LA3zUwvnL0YMgT4IqQ vfj+kaqhUwCDFMQFaNhHYEpUf47c8ds6QOTojdlR28tYRbkerPFaskMrVlFktTVettR6 dgrwQ0knxFPVgKjyoqhs1XCkSk5SVm+Smv7noZFky6HWIggzIVVowijiQ9r9FlD/cpUG Hblw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-type :content-transfer-encoding; bh=+c29MsZ95foMgtQoOh2Mggmb0Rzbdp+kZEYGC7ZdScI=; b=K6kvmGoQl4aWmr6FU9kDcZxVRSap+QeMri7EBWfgCYpOJ0096KguPnuUTnlOYAzdVH SKB0DjKgaexo4jH9yu4z9LX260hyBBIUaWrOKX93gECIaP4d9NkR0+7NpfxR3ttH7w6Z Hkqf6+USL31SCj/dvqhJO+y4CKL/RWShoAtvgtAlvRJmplRBUP3b3eMKhwkCL2l0BA19 7v6MGPO+Q9MJ3MRGia0AwnX/Mnp0cy0XquXZr1rz1qsoQSksFjypsFOYdZXZusTpHD68 g3xHTUo3tMudgxkYxbZlCcNPCOpYwdlSmSW37j8hMryU7AVEKPk79A6TaVkrTua9j94v N/oA== X-Gm-Message-State: AG10YOSkiCiX+U4kVwc5SqRQfAQXoPGaqnYEXpmOsH0wMp962KCzB1cG91R4CsnV7WlBwZNi X-Received: by 10.194.24.39 with SMTP id r7mr27424599wjf.86.1456160234991; Mon, 22 Feb 2016 08:57:14 -0800 (PST) Received: from [192.168.0.44] (host109-149-84-27.range109-149.btcentralplus.com. [109.149.84.27]) by smtp.googlemail.com with ESMTPSA id e194sm22083019wma.19.2016.02.22.08.57.14 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 22 Feb 2016 08:57:14 -0800 (PST) To: Dave Lerner , toaster@yoctoproject.org, belen.barros.pena@linux.intel.com References: <1455920587-25985-1-git-send-email-dave.lerner@windriver.com> <1455920587-25985-2-git-send-email-dave.lerner@windriver.com> From: Michael Wood Message-ID: <56CB3DE8.8060608@intel.com> Date: Mon, 22 Feb 2016 16:57:12 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <1455920587-25985-2-git-send-email-dave.lerner@windriver.com> Subject: Re: [PATCH 1/1] toaster: fix banner after customimage package add X-BeenThere: toaster@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Web based interface for BitBake List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Feb 2016 16:57:18 -0000 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit On 19/02/16 22:23, Dave Lerner wrote: > Correct formatting of the banner message after adding a package to a > custom image. Also, correct the tracking of dependent packages for the > added package, adding them to the set of packages appended to the > base image rather than the set originally included the base image. > > [YOCTO #9101] > > Signed-off-by: Dave Lerner > --- > bitbake/lib/toaster/toastergui/static/js/customrecipe.js | 7 +++++-- > bitbake/lib/toaster/toastergui/views.py | 2 +- > 2 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/bitbake/lib/toaster/toastergui/static/js/customrecipe.js b/bitbake/lib/toaster/toastergui/static/js/customrecipe.js > index a1fe486..3c57899 100644 > --- a/bitbake/lib/toaster/toastergui/static/js/customrecipe.js > +++ b/bitbake/lib/toaster/toastergui/static/js/customrecipe.js > @@ -127,7 +127,8 @@ function customRecipePageInit(ctx) { > if (targetPkg.hasOwnProperty('depsAdded') && > targetPkg.depsAdded.length > 0) { > > - msg += "added " + (targetPkg.depsAdded.length + 1); > + msg += "added "; > + msg += "" + (targetPkg.depsAdded.length + 1) + ""; > msg += " packages to " + ctx.recipe.name + ": "; > msg += "" + targetPkg.name + " and its dependencies"; > > @@ -150,7 +151,9 @@ function customRecipePageInit(ctx) { > (targetPkg.depsAdded.length + 1) + " packages added"); > > } else { > - msg += ' ' + targetPkg.name + ''; > + msg += "added 1"; > + msg += " package to " + ctx.recipe.name + ": "; > + msg += "" + targetPkg.name + ""; > inlineNotify.text("1 package added"); > } Belen tested the UI part and code looks fine to me. > > diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py > index dfa256e..83ba536 100755 > --- a/bitbake/lib/toaster/toastergui/views.py > +++ b/bitbake/lib/toaster/toastergui/views.py > @@ -2644,7 +2644,7 @@ if True: > cust_package = CustomImagePackage.objects.get( > name=dep.depends_on.name) > > - recipe.includes_set.add(cust_package) > + recipe.appends_set.add(cust_package) Packages included was the correct place for these to be added. This includes_set is a list of all the packages that have *not* been added by the user themselves, they get brought in when bitbake does the package level dependency resolution. bitbake is in control of dependency resolution, we aren't a package manager so we do a best guess based on previous build, this gets corrected automatically after rebuilding the recipe. > except: > logger.warning("Could not add package's suggested" > "dependencies to the list") Thanks, Michael