@@ -1,7 +1,7 @@

 Name:            drpm

 Summary:         A library for making, reading and applying deltarpm packages

 Version:         0.5.0

-Release:         2%{?dist}

+Release:         3%{?dist}

 License:         LGPLv2+ and BSD

 URL:             https://github.com/rpm-software-management/%{name}

 Source0:         https://github.com/rpm-software-management/drpm/releases/download/0.5.0/drpm-%{version}.tar.bz2

@@ -36,7 +36,7 @@ mkdir build

 %build

 pushd build

-cmake .. -DWITH_ZSTD:BOOL=no -DHAVE_LZLIB_DEVEL:BOOL=0 -DCMAKE_INSTALL_PREFIX=/usr

+cmake .. -DWITH_ZSTD:BOOL=yes -DHAVE_LZLIB_DEVEL:BOOL=0 -DCMAKE_INSTALL_PREFIX=/usr

 make %{?_smp_mflags}

 popd

@@ -64,6 +64,8 @@ popd

 %{_lib64dir}/pkgconfig/%{name}.pc

 %changelog

+*   Fri Nov 13 2020 Prashant S Chauhan <psinghchauha@vmware.com> 0.5.0-3

+-   make drpm build with zstd

 *   Tue Sep 29 2020 Satya Naga Vasamsetty <svasamsetty@vmware.com> 0.5.0-2

 -   openssl 1.1.1

 *   Fri Jun 26 2020 Keerthana K <keerthanak@vmware.com> 0.5.0-1

@@ -1,7 +1,7 @@

 Summary:        A free package dependency solver

 Name:           libsolv

 Version:        0.6.35

-Release:        6%{?dist}

+Release:        7%{?dist}

 License:        BSD

 URL:            https://github.com/openSUSE/libsolv

 Source0:        https://github.com/openSUSE/libsolv/archive/%{name}-%{version}.tar.gz

@@ -24,6 +24,8 @@ BuildRequires:  libdb-devel

 BuildRequires:  cmake

 BuildRequires:  rpm-devel

 BuildRequires:  expat-devel

+BuildRequires:  zstd-devel

+

 %description

 Libsolv is a free package management library, using SAT technology to solve requests.

 It supports debian, rpm, archlinux and haiku style distributions.

@@ -81,6 +83,8 @@ make %{?_smp_mflags} test

 %{_mandir}/man3/*

 %changelog

+*   Wed Dec 09 2020 Prashant S Chauhan <psinghchauha@vmware.com> 0.6.35-7

+-   Add zstd-devel as Build Requires

 *   Thu Dec 03 2020 Tapas Kundu <tkundu@vmware.com> 0.6.35-6

 -   Further extend choicerule filtering check

 -   Refactor solver addchoicerules function

@@ -932,6 +932,7 @@ def initialize_constants():

     Builder.get_packages_with_build_options(configdict['photon-build-param']['pkg-build-options'])

     Build_Config.setCommonDir(PurePath(curDir, "common", "data"))

     constants.setStartSchedulerServer(configdict["photon-build-param"]['start-scheduler-server'])

+    constants.setCompressionMacro(configdict["photon-build-param"]["compression-macro"])

     constants.initialize()

@@ -8,7 +8,8 @@

             "full-package-list-file" : "build_install_options_all.json",

             "pkg-build-options" : "pkg_build_options.json",

             "photon-docker-image" : "photon:3.0",

-            "target": "iso"

+            "target": "iso",

+            "compression-macro": "w19.zstdio"

     },

     "photon-path" : "",

     "stage-path" : "" ,

@@ -80,6 +80,12 @@ Build config file is a json format with possible parameters:

         Default value: [Makefile targets]

         Example: { "photon-build-param": { "target" : "iso" } }

+  # zstd level range from 1-22, with increase in level means more compression ratio and more time

+  "compression-macro":

+        Default value: "w19.zstdio"

+        values: ["w[1-22].zstdio", "gzip9"]

+        Example: { "photon-build-param": { "compression-macro" : "w19.zstdio" } }

+

 "input-rpms-path":

         Default: [src-root]/inputRPMS

         Example: { "input-rpms-path": [input RPMS path] }

new file mode 100644

@@ -0,0 +1,2 @@

+FROM photon:latest

+RUN tdnf install -y rpm

@@ -32,6 +32,20 @@ class PackageManager(object):

         if self.pkgBuildType == "container":

             import docker

             self.dockerClient = docker.from_env(version="auto")

+        cmdUtils = CommandUtils()

+        # if rpm doesnt have zstd support

+        if cmdUtils.runCommandInShell('rpm --showrc | grep -i "rpmlib(PayloadIsZstd)"', logfn=self.logger.debug):

+            self.createZstdBuilderImage()

+

+    def createZstdBuilderImage(self):

+        import docker

+        self.dockerClient = docker.from_env(version="auto")

+        self.logger.info("creating photon builder docker image")

+        image = self.dockerClient.images.build(tag='photon_builder:latest',

+                                       path="./support/package-builder",

+                                       rm=True,

+                                       dockerfile="Dockerfile.photon_builder")

+        self.logger.debug("Created Image %s"%image)

     def buildToolChain(self):

         self.logger.info("Step 1 : Building the core toolchain packages for " + constants.currentArch)

@@ -126,6 +126,13 @@ class ToolChainUtils(object):

         self.logger.debug(packages)

         cmd = (self.rpmCommand + " -i -v --nodeps --noorder --force --root " +

                chroot.getID() +" --define \'_dbpath /var/lib/rpm\' "+ rpmFiles)

+

+        # if rpm doesnt has zstd support

+        if CommandUtils.runCommandInShell('rpm --showrc | grep -i "rpmlib(PayloadIsZstd)"', logfn=self.logger.debug):

+            cmd = ("docker run -i -v " + constants.prevPublishRPMRepo + ":" + constants.prevPublishRPMRepo +

+                   " -v " + constants.rpmPath + ":" + constants.rpmPath + " -v " + chroot.getID() + ":" +

+                   chroot.getID() + " photon_builder:latest " + "/bin/bash -c \"" + cmd + "\"")

+

         retVal = CommandUtils.runCommandInShell(cmd, logfn=self.logger.debug)

         if retVal != 0:

             self.logger.debug("Command Executed:" + cmd)

@@ -442,6 +442,11 @@ class constants(object):

         constants.katBuild = katBuild

     @staticmethod

+    def setCompressionMacro(compressionMacro):

+        constants.addMacro("_source_payload", compressionMacro)

+        constants.addMacro("_binary_payload", compressionMacro)

+

+    @staticmethod

     def initialize():

         if constants.rpmCheck:

             constants.testLogger = Logger.getLogger("MakeCheckTest",

@@ -25,10 +25,10 @@ aarch64/gawk-4.1.4-2.ph3.aarch64.rpm

 aarch64/gcc-7.3.0-2.ph3.aarch64.rpm

 aarch64/gdbm-1.13-3.ph2.aarch64.rpm

 aarch64/gettext-0.19.8-1.ph2.aarch64.rpm

-aarch64/glibc-2.28-3.ph3.aarch64.rpm

-aarch64/glibc-devel-2.28-3.ph3.aarch64.rpm

-aarch64/glibc-iconv-2.28-3.ph3.aarch64.rpm

-aarch64/glibc-tools-2.28-3.ph3.aarch64.rpm

+aarch64/glibc-2.32-2.ph4.aarch64.rpm

+aarch64/glibc-devel-2.32-2.ph4.aarch64.rpm

+aarch64/glibc-iconv-2.32-2.ph4.aarch64.rpm

+aarch64/glibc-tools-2.32-2.ph4.aarch64.rpm

 aarch64/gmp-6.1.2-3.ph3.aarch64.rpm

 aarch64/gmp-devel-6.1.2-3.ph3.aarch64.rpm

 aarch64/go-1.8.1-2.ph2.aarch64.rpm

@@ -78,10 +78,10 @@ aarch64/python2-devel-2.7.18-1.ph3.aarch64.rpm

 aarch64/python-xml-2.7.18-1.ph3.aarch64.rpm

 aarch64/readline-7.0-2.ph2.aarch64.rpm

 aarch64/readline-devel-7.0-2.ph2.aarch64.rpm

-aarch64/rpm-4.13.0.1-5.ph2.aarch64.rpm

-aarch64/rpm-build-4.13.0.1-5.ph2.aarch64.rpm

-aarch64/rpm-devel-4.13.0.1-5.ph2.aarch64.rpm

-aarch64/rpm-libs-4.13.0.1-5.ph2.aarch64.rpm

+aarch64/rpm-4.14.2-9.ph3.aarch64.rpm

+aarch64/rpm-build-4.14.2-9.ph3.aarch64.rpm

+aarch64/rpm-devel-4.14.2-9.ph3.aarch64.rpm

+aarch64/rpm-libs-4.14.2-9.ph3.aarch64.rpm

 aarch64/sed-4.4-2.ph2.aarch64.rpm

 aarch64/sqlite-3.19.3-1.ph2.aarch64.rpm

 aarch64/sqlite-libs-3.19.3-1.ph2.aarch64.rpm

@@ -6,8 +6,8 @@ x86_64/python2-libs-2.7.18-1.ph3.x86_64.rpm

 x86_64/python2-devel-2.7.18-1.ph3.x86_64.rpm

 x86_64/python-xml-2.7.18-1.ph3.x86_64.rpm

 x86_64/nspr-4.11-1.ph1.x86_64.rpm

-x86_64/rpm-4.13.0.1-5.ph2.x86_64.rpm

-x86_64/rpm-libs-4.13.0.1-5.ph2.x86_64.rpm

+x86_64/rpm-4.14.2-9.ph3.x86_64.rpm

+x86_64/rpm-libs-4.14.2-9.ph3.x86_64.rpm

 x86_64/binutils-devel-2.31-9.ph1.x86_64.rpm

 x86_64/nss-3.21-1.ph1.x86_64.rpm

 x86_64/mpfr-devel-4.0.1-1.ph2.x86_64.rpm

@@ -27,7 +27,7 @@ x86_64/man-db-2.7.5-1.ph1.x86_64.rpm

 x86_64/elfutils-libelf-0.169-2.ph2.x86_64.rpm

 x86_64/gdbm-1.11-1.ph1.x86_64.rpm

 x86_64/autoconf-2.69-3.ph1.x86_64.rpm

-x86_64/rpm-devel-4.13.0.1-5.ph2.x86_64.rpm

+x86_64/rpm-devel-4.14.2-9.ph3.x86_64.rpm

 x86_64/file-5.24-1.ph1.x86_64.rpm

 x86_64/mpfr-4.0.1-1.ph2.x86_64.rpm

 x86_64/zlib-devel-1.2.8-2.ph1.x86_64.rpm

@@ -36,7 +36,7 @@ x86_64/libgcc-atomic-7.3.0-2.ph2.x86_64.rpm

 x86_64/bison-3.0.4-1.ph1.x86_64.rpm

 x86_64/lua-5.3.2-1.ph1.x86_64.rpm

 x86_64/util-linux-2.27.1-1.ph1.x86_64.rpm

-x86_64/rpm-build-4.13.0.1-5.ph2.x86_64.rpm

+x86_64/rpm-build-4.14.2-9.ph3.x86_64.rpm

 x86_64/procps-ng-3.3.11-1.ph1.x86_64.rpm

 x86_64/coreutils-8.24-1.ph1.x86_64.rpm

 x86_64/util-linux-devel-2.27.1-1.ph1.x86_64.rpm

@@ -59,7 +59,7 @@ x86_64/expat-2.1.0-1.ph1.x86_64.rpm

 x86_64/popt-1.16-1.ph1.x86_64.rpm

 x86_64/mpc-1.0.3-1.ph1.x86_64.rpm

 x86_64/bzip2-1.0.6-4.ph1.x86_64.rpm

-x86_64/glibc-2.22-3.ph1.x86_64.rpm

+x86_64/glibc-2.32-1.ph4.x86_64.rpm

 x86_64/elfutils-devel-0.169-2.ph2.x86_64.rpm

 x86_64/patch-2.7.5-1.ph1.x86_64.rpm

 x86_64/xz-5.2.2-1.ph1.x86_64.rpm

@@ -78,7 +78,7 @@ x86_64/findutils-4.4.2-1.ph1.x86_64.rpm

 x86_64/libstdc++-7.3.0-2.ph2.x86_64.rpm

 x86_64/libpipeline-1.4.1-1.ph1.x86_64.rpm

 x86_64/make-4.1-1.ph1.x86_64.rpm

-x86_64/glibc-devel-2.22-3.ph1.x86_64.rpm

+x86_64/glibc-devel-2.32-1.ph4.x86_64.rpm

 x86_64/lua-devel-5.3.2-1.ph1.x86_64.rpm

 x86_64/ncurses-6.0-1.ph1.x86_64.rpm

 x86_64/texinfo-6.1-1.ph1.x86_64.rpm