From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f182.google.com (mail-pf0-f182.google.com [209.85.192.182]) by mail.openembedded.org (Postfix) with ESMTP id C9C3E731E8 for ; Wed, 6 Jan 2016 12:22:27 +0000 (UTC) Received: by mail-pf0-f182.google.com with SMTP id 78so241330799pfw.2 for ; Wed, 06 Jan 2016 04:22:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=madison-systems.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=L+WgGueEewZDgNzDAYh3AV4m8U5RLoo8UewheSdEN+k=; b=j4+MsNMiT1jPiJXxF3rZJbe/DZMmL6Is4AHBsvQIoXV1hJnseLYQFqxb1VyvaT7k6d rBHBmcU0fDuADKoqnkF6EJ4MU3hcoNEv30DSgmEbICtoemihG5nXSb4vtOg+gY12Y49p XOucgSS0OmaSTHF/dcNrr7Q4RSMRUIiuVducrd5V55DVOAYJiqD6bGYv0xP9KaDc3RkE PHjL6BjSA/LQ7NGtYQNQlYMX6AhcpjE7oNaqp2N5i1f9NNr2cKMUN76EFhvCTqNGsPS3 un8aggiri4lNqJQrN/3O2X38JEA2o2fX12Vu3J0pU5lGvKshbVlym4IHXs27zH4oB28u yohg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=L+WgGueEewZDgNzDAYh3AV4m8U5RLoo8UewheSdEN+k=; b=C/M+uUuWHTsud6URZeGXLXTteY2GfLFkgort+6QW5JLPLbX4GjLLKFzrSivn5htfJ/ SjJMi0WrQoBOXo1WmYcPyaGlqm6x329OMO6rFyzrjSvUVChHV5awDt8TIS6Q91BPDToq 8+djM9QZ42lfz0sxQLZWISsgleRF/0+qkAo5ZXJQyk1LnZHL3dTZ9Pyyo+kcl2atebDd H+tx/VQZ9WjkvN5W6J8GW35MpFeuyhqKSrXR7S1Kng/+d7hzrFECi8ceXJlyuAht9bmo +ZJqgnUwbSZotQfdcjFz9wPEs79/rqyViAruERLqEaUtse6riJ0iwcieXsFIxFpKpy3v DcJQ== X-Gm-Message-State: ALoCoQl/qfrW1nmUA/0Y0hcZooMMtqEzYTR/S0eXoP9851IuEOsGuGuRCHccfniD7zII56xXAPcRNIVsPcEkoHOuujJSlNqjqA== X-Received: by 10.98.16.139 with SMTP id 11mr50588614pfq.17.1452082948437; Wed, 06 Jan 2016 04:22:28 -0800 (PST) Received: from workhorse.madison.systems (70.90.175.93-BusName-ca.sfba.hfc.comcastbusiness.net. [70.90.175.93]) by smtp.gmail.com with ESMTPSA id c5sm1479817pfj.89.2016.01.06.04.22.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Jan 2016 04:22:27 -0800 (PST) From: Matt Madison To: openembedded-core@lists.openembedded.org Date: Wed, 6 Jan 2016 04:21:34 -0800 Message-Id: <1452082896-3261-3-git-send-email-matt@madison.systems> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1452082896-3261-1-git-send-email-matt@madison.systems> References: <1452082896-3261-1-git-send-email-matt@madison.systems> MIME-Version: 1.0 Subject: [PATCH v3 2/4] package_manager.py: fixes for multilib deb packaging builds X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jan 2016 12:22:27 -0000 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * tmp/deploy/deb subdirectories do not get hyphens replaced with underscores, so don't do that translation when building the sources list. * Fix MULTILIB_VARIANTS handling to be more general and work for all architectures * Also include a fix for a warning generated by apt due to missing apt/preferences.d directory. Signed-off-by: Matt Madison Signed-off-by: Aníbal Limón --- meta/lib/oe/package_manager.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 32afeaf..bc39721 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -247,7 +247,7 @@ class DpkgIndexer(Indexer): if a not in pkg_archs: arch_list.append(a) - all_mlb_pkg_arch_list = (self.d.getVar('ALL_MULTILIB_PACKAGE_ARCHS', True) or "").replace('-', '_').split() + all_mlb_pkg_arch_list = (self.d.getVar('ALL_MULTILIB_PACKAGE_ARCHS', True) or "").split() arch_list.extend(arch for arch in all_mlb_pkg_arch_list if arch not in arch_list) apt_ftparchive = bb.utils.which(os.getenv('PATH'), "apt-ftparchive") @@ -1775,7 +1775,7 @@ class DpkgPM(PackageManager): self.apt_args = d.getVar("APT_ARGS", True) self.all_arch_list = archs.split() - all_mlb_pkg_arch_list = (self.d.getVar('ALL_MULTILIB_PACKAGE_ARCHS', True) or "").replace('-', '_').split() + all_mlb_pkg_arch_list = (self.d.getVar('ALL_MULTILIB_PACKAGE_ARCHS', True) or "").split() self.all_arch_list.extend(arch for arch in all_mlb_pkg_arch_list if arch not in self.all_arch_list) self._create_configs(archs, base_archs) @@ -1966,6 +1966,7 @@ class DpkgPM(PackageManager): bb.utils.mkdirhier(self.apt_conf_dir) bb.utils.mkdirhier(self.apt_conf_dir + "/lists/partial/") bb.utils.mkdirhier(self.apt_conf_dir + "/apt.conf.d/") + bb.utils.mkdirhier(self.apt_conf_dir + "/preferences.d/") arch_list = [] for arch in self.all_arch_list: @@ -2000,10 +2001,14 @@ class DpkgPM(PackageManager): base_arch_list = base_archs.split() multilib_variants = self.d.getVar("MULTILIB_VARIANTS", True); for variant in multilib_variants.split(): - if variant == "lib32": - base_arch_list.append("i386") - elif variant == "lib64": - base_arch_list.append("amd64") + localdata = bb.data.createCopy(self.d) + variant_tune = localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + variant, False) + orig_arch = localdata.getVar("DPKG_ARCH", True) + localdata.setVar("DEFAULTTUNE", variant_tune) + bb.data.update_data(localdata) + variant_arch = localdata.getVar("DPKG_ARCH", True) + if variant_arch not in base_arch_list: + base_arch_list.append(variant_arch) with open(self.apt_conf_file, "w+") as apt_conf: with open(self.d.expand("${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample")) as apt_conf_sample: -- 2.5.0