From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.windriver.com (mail.windriver.com [147.11.1.11]) by mail.openembedded.org (Postfix) with ESMTP id 105AF65D58 for ; Wed, 24 Sep 2014 01:30:36 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail.windriver.com (8.14.9/8.14.5) with ESMTP id s8O1UawL019076 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL) for ; Tue, 23 Sep 2014 18:30:37 -0700 (PDT) Received: from [128.224.162.181] (128.224.162.181) by ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server id 14.3.174.1; Tue, 23 Sep 2014 18:30:36 -0700 Message-ID: <54221EBB.8070606@windriver.com> Date: Wed, 24 Sep 2014 09:30:35 +0800 From: Robert Yang User-Agent: Mozilla/5.0 (X11; Linux i686; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: References: <4e8cdaffb79ea56a3644ede8af0cacbefd167197.1410257258.git.liezhi.yang@windriver.com> In-Reply-To: <4e8cdaffb79ea56a3644ede8af0cacbefd167197.1410257258.git.liezhi.yang@windriver.com> Subject: Re: [PATCH 1/1] rootfs.py: fix PRE/POSTPROCESS_COMMANDS for rpm and deb 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, 24 Sep 2014 01:30:45 -0000 Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Ping, I think that we need it since it is a function lost. // Robert On 09/09/2014 06:16 PM, Robert Yang wrote: > The rpm didn't run RPM_PREPROCESS_COMMANDS or RPM_POSTPROCESS_COMMANDS, > the similar to deb, this patch fix the problem. > > And fix a typo: > DEB_POSTPROCESS_COMMAND -> DEB_POSTPROCESS_COMMANDS > > Signed-off-by: Robert Yang > --- > meta/lib/oe/rootfs.py | 14 +++++++++++++- > 1 file changed, 13 insertions(+), 1 deletion(-) > > diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py > index 0424a01..ed2af80 100644 > --- a/meta/lib/oe/rootfs.py > +++ b/meta/lib/oe/rootfs.py > @@ -295,10 +295,14 @@ class RpmRootfs(Rootfs): > > def _create(self): > pkgs_to_install = self.manifest.parse_initial_manifest() > + rpm_pre_process_cmds = self.d.getVar('RPM_PREPROCESS_COMMANDS', True) > + rpm_post_process_cmds = self.d.getVar('RPM_POSTPROCESS_COMMANDS', True) > > # update PM index files > self.pm.write_index() > > + execute_pre_post_process(self.d, rpm_pre_process_cmds) > + > self.pm.dump_all_available_pkgs() > > if self.inc_rpm_image_gen == "1": > @@ -320,6 +324,8 @@ class RpmRootfs(Rootfs): > > self.pm.install_complementary() > > + execute_pre_post_process(self.d, rpm_post_process_cmds) > + > self._log_check() > > if self.inc_rpm_image_gen == "1": > @@ -401,6 +407,8 @@ class DpkgRootfs(Rootfs): > > def _create(self): > pkgs_to_install = self.manifest.parse_initial_manifest() > + deb_pre_process_cmds = self.d.getVar('DEB_PREPROCESS_COMMANDS', True) > + deb_post_process_cmds = self.d.getVar('DEB_POSTPROCESS_COMMANDS', True) > > alt_dir = self.d.expand("${IMAGE_ROOTFS}/var/lib/dpkg/alternatives") > bb.utils.mkdirhier(alt_dir) > @@ -408,6 +416,8 @@ class DpkgRootfs(Rootfs): > # update PM index files > self.pm.write_index() > > + execute_pre_post_process(self.d, deb_pre_process_cmds) > + > self.pm.update() > > for pkg_type in self.install_order: > @@ -423,9 +433,11 @@ class DpkgRootfs(Rootfs): > > self.pm.run_pre_post_installs() > > + execute_pre_post_process(self.d, deb_post_process_cmds) > + > @staticmethod > def _depends_list(): > - return ['DEPLOY_DIR_DEB', 'DEB_SDK_ARCH', 'APTCONF_TARGET', 'APT_ARGS', 'DPKG_ARCH', 'DEB_PREPROCESS_COMMANDS', 'DEB_POSTPROCESS_COMMAND'] > + return ['DEPLOY_DIR_DEB', 'DEB_SDK_ARCH', 'APTCONF_TARGET', 'APT_ARGS', 'DPKG_ARCH', 'DEB_PREPROCESS_COMMANDS', 'DEB_POSTPROCESS_COMMANDS'] > > def _get_delayed_postinsts(self): > pkg_list = [] >