From 334b8e6ad1475ed2bd457c324f23c6c582ac466d Mon Sep 17 00:00:00 2001 From: Tomas Tomecek Date: Fri, 12 May 2017 22:21:27 +0200 Subject: [PATCH 1/4] build varnish using bootstrap module Signed-off-by: Tomas Tomecek --- varnish.yaml | 226 ++++++++++++++++++++++++++------------------------- 1 file changed, 114 insertions(+), 112 deletions(-) diff --git a/varnish.yaml b/varnish.yaml index 341c76c..81f4f36 100644 --- a/varnish.yaml +++ b/varnish.yaml @@ -7,10 +7,12 @@ data: module: [ MIT ] dependencies: buildrequires: - #workaround before base-runtime is ready - bootstrap: master + bootstrap: f26 + # base-runtime: f26 + # shared-userspace: f26 + # perl: f26 requires: - base-runtime: master + bootstrap: f26 references: community: https://docs.pagure.org/modularity/ documentation: https://github.com/container-images/varnish @@ -26,113 +28,113 @@ data: rpms: varnish: rationale: Provides API for this module. - ref: f25 + ref: f26 - generic-release: - rationale: dependency. - ref: f25 - hostname: - rationale: dependency. - ref: f25 - initscripts: - rationale: dependency. - ref: f25 - ipcalc: - rationale: dependency. - ref: f25 - iproute: - rationale: dependency. - ref: f25 - iputils: - rationale: dependency. - ref: f25 - jemalloc: - rationale: dependency. - ref: f25 - libedit: - rationale: dependency. - ref: f25 - libmnl: - rationale: dependency. - ref: f25 - logrotate: - rationale: dependency. - ref: f25 - perl-Carp: - rationale: dependency. - ref: f25 - perl-constant: - rationale: dependency. - ref: f25 - perl-Encode: - rationale: dependency. - ref: f25 - perl-Exporter: - rationale: dependency. - ref: f25 - perl-File-Path: - rationale: dependency. - ref: f25 - perl-File-Temp: - rationale: dependency. - ref: f25 - perl-Getopt-Long: - rationale: dependency. - ref: f25 - perl-HTTP-Tiny: - rationale: dependency. - ref: f25 - perl-MIME-Base64: - rationale: dependency. - ref: f25 - perl-parent: - rationale: dependency. - ref: f25 - perl-PathTools: - rationale: dependency. - ref: f25 - perl-Pod-Escapes: - rationale: dependency. - ref: f25 - perl-podlators: - rationale: dependency. - ref: f25 - perl-Pod-Perldoc: - rationale: dependency. - ref: f25 - perl-Pod-Simple: - rationale: dependency. - ref: f25 - perl-Pod-Usage: - rationale: dependency. - ref: f25 - perl-Scalar-List-Utils: - rationale: dependency. - ref: f25 - perl-Socket: - rationale: dependency. - ref: f25 - perl-Term-ANSIColor: - rationale: dependency. - ref: f25 - perl-Term-Cap: - rationale: dependency. - ref: f25 - perl-Text-ParseWords: - rationale: dependency. - ref: f25 - perl-Text-Tabs+Wrap: - rationale: dependency. - ref: f25 - perl-threads: - rationale: dependency. - ref: f25 - perl-threads-shared: - rationale: dependency. - ref: f25 - perl-Time-Local: - rationale: dependency. - ref: f25 - perl-Unicode-Normalize: - rationale: dependency. - ref: f25 + # generic-release: + # rationale: dependency. + # ref: f25 + # hostname: + # rationale: dependency. + # ref: f25 + # initscripts: + # rationale: dependency. + # ref: f25 + # ipcalc: + # rationale: dependency. + # ref: f25 + # iproute: + # rationale: dependency. + # ref: f25 + # iputils: + # rationale: dependency. + # ref: f25 + # jemalloc: + # rationale: dependency. + # ref: f25 + # libedit: + # rationale: dependency. + # ref: f25 + # libmnl: + # rationale: dependency. + # ref: f25 + # logrotate: + # rationale: dependency. + # ref: f25 + # perl-Carp: + # rationale: dependency. + # ref: f25 + # perl-constant: + # rationale: dependency. + # ref: f25 + # perl-Encode: + # rationale: dependency. + # ref: f25 + # perl-Exporter: + # rationale: dependency. + # ref: f25 + # perl-File-Path: + # rationale: dependency. + # ref: f25 + # perl-File-Temp: + # rationale: dependency. + # ref: f25 + # perl-Getopt-Long: + # rationale: dependency. + # ref: f25 + # perl-HTTP-Tiny: + # rationale: dependency. + # ref: f25 + # perl-MIME-Base64: + # rationale: dependency. + # ref: f25 + # perl-parent: + # rationale: dependency. + # ref: f25 + # perl-PathTools: + # rationale: dependency. + # ref: f25 + # perl-Pod-Escapes: + # rationale: dependency. + # ref: f25 + # perl-podlators: + # rationale: dependency. + # ref: f25 + # perl-Pod-Perldoc: + # rationale: dependency. + # ref: f25 + # perl-Pod-Simple: + # rationale: dependency. + # ref: f25 + # perl-Pod-Usage: + # rationale: dependency. + # ref: f25 + # perl-Scalar-List-Utils: + # rationale: dependency. + # ref: f25 + # perl-Socket: + # rationale: dependency. + # ref: f25 + # perl-Term-ANSIColor: + # rationale: dependency. + # ref: f25 + # perl-Term-Cap: + # rationale: dependency. + # ref: f25 + # perl-Text-ParseWords: + # rationale: dependency. + # ref: f25 + # perl-Text-Tabs+Wrap: + # rationale: dependency. + # ref: f25 + # perl-threads: + # rationale: dependency. + # ref: f25 + # perl-threads-shared: + # rationale: dependency. + # ref: f25 + # perl-Time-Local: + # rationale: dependency. + # ref: f25 + # perl-Unicode-Normalize: + # rationale: dependency. + # ref: f25 From 77da0aa9a83267a06e2ee63adb8c7d58617c4e7e Mon Sep 17 00:00:00 2001 From: Tomas Tomecek Date: Tue, 30 May 2017 17:40:05 +0200 Subject: [PATCH 2/4] add runtime deps Signed-off-by: Tomas Tomecek --- varnish.yaml | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/varnish.yaml b/varnish.yaml index 81f4f36..11c14b2 100644 --- a/varnish.yaml +++ b/varnish.yaml @@ -10,9 +10,13 @@ data: bootstrap: f26 # base-runtime: f26 # shared-userspace: f26 - # perl: f26 + perl: f26 requires: - bootstrap: f26 + base-runtime: f26 + perl: f26 + shared-userspace: f26 + # initscripts + installer: f26 references: community: https://docs.pagure.org/modularity/ documentation: https://github.com/container-images/varnish @@ -29,6 +33,19 @@ data: varnish: rationale: Provides API for this module. ref: f26 + buildorder: 1 + jemalloc: + rationale: Runtime dependency. + ref: f25 + chkconfig: + rationale: Runtime dependency. + ref: f25 + logrotate: + rationale: Runtime dependency. + ref: f25 + util-linux: + rationale: Runtime dependency. + ref: f25 # generic-release: # rationale: dependency. From b073ba748b8b8ef74bb59722753fb09dae1f030f Mon Sep 17 00:00:00 2001 From: Tomas Tomecek Date: Thu, 22 Jun 2017 18:18:17 +0200 Subject: [PATCH 3/4] remove chkconfig, s/f25/f26/ Signed-off-by: Tomas Tomecek --- varnish.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/varnish.yaml b/varnish.yaml index 11c14b2..a50e5de 100644 --- a/varnish.yaml +++ b/varnish.yaml @@ -36,16 +36,13 @@ data: buildorder: 1 jemalloc: rationale: Runtime dependency. - ref: f25 - chkconfig: - rationale: Runtime dependency. - ref: f25 + ref: f26 logrotate: rationale: Runtime dependency. - ref: f25 + ref: f26 util-linux: rationale: Runtime dependency. - ref: f25 + ref: f26 # generic-release: # rationale: dependency. From f8a3033d474f65f169a8f48a8eb22105d088b9aa Mon Sep 17 00:00:00 2001 From: Tomas Tomecek Date: Mon, 10 Jul 2017 09:59:24 +0200 Subject: [PATCH 4/4] remove util-linux: it's part of BRT Signed-off-by: Tomas Tomecek --- varnish.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/varnish.yaml b/varnish.yaml index a50e5de..f06acad 100644 --- a/varnish.yaml +++ b/varnish.yaml @@ -40,9 +40,6 @@ data: logrotate: rationale: Runtime dependency. ref: f26 - util-linux: - rationale: Runtime dependency. - ref: f26 # generic-release: # rationale: dependency.