From 0a0f53b526087366235955c1d1cb175450507be9 Mon Sep 17 00:00:00 2001 From: hbai Date: Tue, 19 Apr 2022 17:06:13 +0800 Subject: [PATCH] Revert "debrepack: Handle the KERNEL_TYPE placeholder issue" This reverts commit a90bc3ccd37f9e2892ccc4c65c1849485112517f. Signed-off-by: hbai Change-Id: Ib552dc0551afe6845a83425e1234dc2f409d279e --- build-tools/stx/build-pkgs | 3 --- build-tools/stx/debrepack.py | 29 ++--------------------------- 2 files changed, 2 insertions(+), 30 deletions(-) diff --git a/build-tools/stx/build-pkgs b/build-tools/stx/build-pkgs index 8d84e404..7e1667fb 100755 --- a/build-tools/stx/build-pkgs +++ b/build-tools/stx/build-pkgs @@ -629,9 +629,6 @@ class BuildController(): for p in range(len(pkgs_dsc)): pkgs_can_build = deps_resolver.get_build_able_pkg(1) - if not pkgs_can_build: - logger.warning("Depends resolver returns none package") - return for dsc in pkgs_can_build: logger.info(' '.join(['Depends resolver tells to build', os.path.basename(dsc)])) diff --git a/build-tools/stx/debrepack.py b/build-tools/stx/debrepack.py index cecbee3a..150a3042 100755 --- a/build-tools/stx/debrepack.py +++ b/build-tools/stx/debrepack.py @@ -10,7 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# Copyright (C) 2021-2022 WindRiver Corporation +# Copyright (C) 2021 WindRiver Corporation # import apt import apt_pkg @@ -35,7 +35,6 @@ RELEASENOTES = " ".join([os.environ.get('PROJECT'), os.environ.get('MY_RELEASE') DIST = os.environ.get('STX_DIST') CENGN_BASE = os.path.join(os.environ.get('CENGNURL'), "debian") CENGN_STRATEGY = os.environ.get('CENGN_STRATEGY') -BTYPE = "@KERNEL_TYPE@" class DownloadProgress(): @@ -235,7 +234,7 @@ class Parser(): 'crit': logging.CRITICAL } - def __init__(self, basedir, output, loglevel='info', srcrepo=None, btype="std"): + def __init__(self, basedir, output, loglevel='info', srcrepo=None): self.logger = logging.getLogger(__name__) self.logger.setLevel(self.level_relations.get(loglevel)) @@ -261,7 +260,6 @@ class Parser(): self.output = os.path.abspath(output) self.srcrepo = srcrepo - self.btype = btype self.meta_data = dict() self.versions = dict() self.pkginfo = dict() @@ -334,24 +332,6 @@ class Parser(): if os.path.exists(self.pkginfo["srcdir"]): shutil.rmtree(self.pkginfo["srcdir"]) - def set_build_type(self): - - local_debian = os.path.join(self.pkginfo["packdir"], "local_debian") - run_shell_cmd('cp -r %s %s' % (self.pkginfo["debfolder"], local_debian), self.logger) - - # clean @KERNEL_TYPE@ if build type is std - if self.btype == "std": - btype = "" - else: - btype = "-" + self.btype - - sed_cmd = 'sed -i s#%s#%s#g %s' - for root, _, files in os.walk(local_debian): - for name in files: - run_shell_cmd(sed_cmd % (BTYPE, btype, os.path.join(root, name)), self.logger) - - self.pkginfo["debfolder"] = os.path.join(local_debian) - def set_revision(self): revision = 0 @@ -359,9 +339,6 @@ class Parser(): if "revision" not in self.meta_data: return dist - # reset the debfolder - self.pkginfo["debfolder"] = os.path.join(self.pkginfo["pkgpath"], "debian") - revision_data = self.meta_data["revision"] if "dist" in revision_data: if revision_data["dist"] is not None: @@ -806,8 +783,6 @@ class Parser(): shutil.rmtree(self.pkginfo["packdir"]) os.mkdir(self.pkginfo["packdir"]) - self.set_build_type() - logfile = os.path.join(self.pkginfo["packdir"], self.pkginfo["pkgname"] + ".log") if os.path.exists(logfile): os.remove(logfile)