From e7eb65a0e1e66a8176d28ba8c45b9e54d4ef4e9e Mon Sep 17 00:00:00 2001 From: mkocka Date: Tue, 11 Apr 2017 10:33:01 +0200 Subject: [PATCH 01/15] First commit php.yaml and deps in README.md --- README.md | 36 +++++++++++++++++++++++++++++++++ php.yaml | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 README.md create mode 100644 php.yaml diff --git a/README.md b/README.md new file mode 100644 index 0000000..243f71f --- /dev/null +++ b/README.md @@ -0,0 +1,36 @@ +php dependencies +==================== + +build dependencies calculated by brt_dep_solver +----------------------------------------------- +aspell +curl +enchant +exim +firebird +freetds +gd +httpd +icu +libedit +libmcrypt +libtool +libxml2 +libxslt +net-snmp +nginx +opensmtpd +pcre +postfix +postgresql +recode +sendmail +sqlite +tidy +tokyocabinet +unixODBC +uw-imap + +runtime dependencies calculated by brt_dep_solver +----------------------------------------------- +php diff --git a/php.yaml b/php.yaml new file mode 100644 index 0000000..ec7e792 --- /dev/null +++ b/php.yaml @@ -0,0 +1,59 @@ +data: + api: + rpms: + - php + components: + rpms: + aspell: {rationale: Build dependency.} + curl: {rationale: Build dependency.} + enchant: {rationale: Build dependency.} + exim: {rationale: Build dependency.} + firebird: {rationale: Build dependency.} + freetds: {rationale: Build dependency.} + gd: {rationale: Build dependency.} + httpd: {rationale: Build dependency.} + icu: {rationale: Build dependency.} + libedit: {rationale: Build dependency.} + libmcrypt: {rationale: Build dependency.} + libtool: {rationale: Build dependency.} + libxml2: {rationale: Build dependency.} + libxslt: {rationale: Build dependency.} + net-snmp: {rationale: Build dependency.} + nginx: {rationale: Build dependency.} + opensmtpd: {rationale: Build dependency.} + pcre: {rationale: Build dependency.} + php: {rationale: Runtime dependency.} + postfix: {rationale: Build dependency.} + postgresql: {rationale: Build dependency.} + recode: {rationale: Build dependency.} + sendmail: {rationale: Build dependency.} + sqlite: {rationale: Build dependency.} + tidy: {rationale: Build dependency.} + tokyocabinet: {rationale: Build dependency.} + unixODBC: {rationale: Build dependency.} + uw-imap: {rationale: Build dependency.} + description: 'PHP is an HTML-embedded scripting language. PHP attempts to make it + + easy for developers to write dynamically generated web pages. PHP also + + offers built-in database integration for several commercial and + + non-commercial database management systems, so writing a + + database-enabled webpage with PHP is fairly simple. The most common + + use of PHP coding is probably as a replacement for CGI scripts. + + + The php package contains the module (often referred to as mod_php) + + which adds support for the PHP language to Apache HTTP Server.' + filter: {} + license: + module: [PHP and Zend and BSD] + name: '' + stream: '' + summary: PHP scripting language for creating dynamic web sites + version: 0 +document: modulemd +version: 1 From 0bcc6f32180958d9d1ec8a5854bb150b678af9bc Mon Sep 17 00:00:00 2001 From: mkocka Date: Sun, 14 May 2017 22:55:23 +0200 Subject: [PATCH 02/15] New modulemd --- php.yaml | 129 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 72 insertions(+), 57 deletions(-) diff --git a/php.yaml b/php.yaml index ec7e792..64d7e23 100644 --- a/php.yaml +++ b/php.yaml @@ -1,59 +1,74 @@ -data: - api: - rpms: - - php - components: - rpms: - aspell: {rationale: Build dependency.} - curl: {rationale: Build dependency.} - enchant: {rationale: Build dependency.} - exim: {rationale: Build dependency.} - firebird: {rationale: Build dependency.} - freetds: {rationale: Build dependency.} - gd: {rationale: Build dependency.} - httpd: {rationale: Build dependency.} - icu: {rationale: Build dependency.} - libedit: {rationale: Build dependency.} - libmcrypt: {rationale: Build dependency.} - libtool: {rationale: Build dependency.} - libxml2: {rationale: Build dependency.} - libxslt: {rationale: Build dependency.} - net-snmp: {rationale: Build dependency.} - nginx: {rationale: Build dependency.} - opensmtpd: {rationale: Build dependency.} - pcre: {rationale: Build dependency.} - php: {rationale: Runtime dependency.} - postfix: {rationale: Build dependency.} - postgresql: {rationale: Build dependency.} - recode: {rationale: Build dependency.} - sendmail: {rationale: Build dependency.} - sqlite: {rationale: Build dependency.} - tidy: {rationale: Build dependency.} - tokyocabinet: {rationale: Build dependency.} - unixODBC: {rationale: Build dependency.} - uw-imap: {rationale: Build dependency.} - description: 'PHP is an HTML-embedded scripting language. PHP attempts to make it - - easy for developers to write dynamically generated web pages. PHP also - - offers built-in database integration for several commercial and - - non-commercial database management systems, so writing a - - database-enabled webpage with PHP is fairly simple. The most common - - use of PHP coding is probably as a replacement for CGI scripts. - - - The php package contains the module (often referred to as mod_php) - - which adds support for the PHP language to Apache HTTP Server.' - filter: {} - license: - module: [PHP and Zend and BSD] - name: '' - stream: '' - summary: PHP scripting language for creating dynamic web sites - version: 0 document: modulemd version: 1 +data: + summary: PHP scripting language for creating dynamic web sites + description: PHP is an HTML-embedded scripting language. PHP attempts to make it + easy for developers to write dynamically generated web pages. PHP also + offers built-in database integration for several commercial and + non-commercial database management systems, so writing a + database-enabled webpage with PHP is fairly simple. The most common + use of PHP coding is probably as a replacement for CGI scripts. + The php package contains the module (often referred to as mod_php) + which adds support for the PHP language to Apache HTTP Server. + license: + module: [PHP and Zend and BSD] + dependencies: + buildrequires: +# base-runtime: f26 + bootstrap: f26 + common-build-dependencies: f26 + shared-userspace: f26 + perl: f26 + postgresql: f26 + nginx: f26 + httpd: f26 + requires: + perl: f26 + shared-userspace: f26 + base-runtime: f26 + httpd: f26 + references: + community: https://fedoraproject.org/wiki/Modularity + documentation: https://fedoraproject.org/wiki/Fedora_Packaging_Guidelines_for_Modules + tracker: https://taiga.fedorainfracloud.org/project/modularity + profiles: + default: + rpms: + - php + api: + rpms: + - php + components: + rpms: + php: + rationale: php package. + ref: f26 + buildorder: 10 +# aspell: {rationale: Build dependency.} +# curl: {rationale: Build dependency.} +# enchant: {rationale: Build dependency.} +# exim: {rationale: Build dependency.} +# firebird: {rationale: Build dependency.} +# freetds: {rationale: Build dependency.} +# gd: {rationale: Build dependency.} +# httpd: {rationale: Build dependency.} +# icu: {rationale: Build dependency.} +# libedit: {rationale: Build dependency.} +# libmcrypt: {rationale: Build dependency.} +# libtool: {rationale: Build dependency.} +# libxml2: {rationale: Build dependency.} +# libxslt: {rationale: Build dependency.} +# net-snmp: {rationale: Build dependency.} +# nginx: {rationale: Build dependency.} +# opensmtpd: {rationale: Build dependency.} +# pcre: {rationale: Build dependency.} +# php: {rationale: Runtime dependency.} +# postfix: {rationale: Build dependency.} +# postgresql: {rationale: Build dependency.} +# recode: {rationale: Build dependency.} +# sendmail: {rationale: Build dependency.} +# sqlite: {rationale: Build dependency.} +# tidy: {rationale: Build dependency.} +# tokyocabinet: {rationale: Build dependency.} +# unixODBC: {rationale: Build dependency.} +# uw-imap: {rationale: Build dependency.} From 8176e05bdea5fd89244de51be3570892da88373c Mon Sep 17 00:00:00 2001 From: mkocka Date: Sun, 14 May 2017 23:44:17 +0200 Subject: [PATCH 03/15] copy from master --- README.md | 36 +++++++++++++++++++++++++++ php.yaml | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 README.md create mode 100644 php.yaml diff --git a/README.md b/README.md new file mode 100644 index 0000000..243f71f --- /dev/null +++ b/README.md @@ -0,0 +1,36 @@ +php dependencies +==================== + +build dependencies calculated by brt_dep_solver +----------------------------------------------- +aspell +curl +enchant +exim +firebird +freetds +gd +httpd +icu +libedit +libmcrypt +libtool +libxml2 +libxslt +net-snmp +nginx +opensmtpd +pcre +postfix +postgresql +recode +sendmail +sqlite +tidy +tokyocabinet +unixODBC +uw-imap + +runtime dependencies calculated by brt_dep_solver +----------------------------------------------- +php diff --git a/php.yaml b/php.yaml new file mode 100644 index 0000000..64d7e23 --- /dev/null +++ b/php.yaml @@ -0,0 +1,74 @@ +document: modulemd +version: 1 +data: + summary: PHP scripting language for creating dynamic web sites + description: PHP is an HTML-embedded scripting language. PHP attempts to make it + easy for developers to write dynamically generated web pages. PHP also + offers built-in database integration for several commercial and + non-commercial database management systems, so writing a + database-enabled webpage with PHP is fairly simple. The most common + use of PHP coding is probably as a replacement for CGI scripts. + The php package contains the module (often referred to as mod_php) + which adds support for the PHP language to Apache HTTP Server. + license: + module: [PHP and Zend and BSD] + dependencies: + buildrequires: +# base-runtime: f26 + bootstrap: f26 + common-build-dependencies: f26 + shared-userspace: f26 + perl: f26 + postgresql: f26 + nginx: f26 + httpd: f26 + requires: + perl: f26 + shared-userspace: f26 + base-runtime: f26 + httpd: f26 + references: + community: https://fedoraproject.org/wiki/Modularity + documentation: https://fedoraproject.org/wiki/Fedora_Packaging_Guidelines_for_Modules + tracker: https://taiga.fedorainfracloud.org/project/modularity + profiles: + default: + rpms: + - php + api: + rpms: + - php + components: + rpms: + php: + rationale: php package. + ref: f26 + buildorder: 10 +# aspell: {rationale: Build dependency.} +# curl: {rationale: Build dependency.} +# enchant: {rationale: Build dependency.} +# exim: {rationale: Build dependency.} +# firebird: {rationale: Build dependency.} +# freetds: {rationale: Build dependency.} +# gd: {rationale: Build dependency.} +# httpd: {rationale: Build dependency.} +# icu: {rationale: Build dependency.} +# libedit: {rationale: Build dependency.} +# libmcrypt: {rationale: Build dependency.} +# libtool: {rationale: Build dependency.} +# libxml2: {rationale: Build dependency.} +# libxslt: {rationale: Build dependency.} +# net-snmp: {rationale: Build dependency.} +# nginx: {rationale: Build dependency.} +# opensmtpd: {rationale: Build dependency.} +# pcre: {rationale: Build dependency.} +# php: {rationale: Runtime dependency.} +# postfix: {rationale: Build dependency.} +# postgresql: {rationale: Build dependency.} +# recode: {rationale: Build dependency.} +# sendmail: {rationale: Build dependency.} +# sqlite: {rationale: Build dependency.} +# tidy: {rationale: Build dependency.} +# tokyocabinet: {rationale: Build dependency.} +# unixODBC: {rationale: Build dependency.} +# uw-imap: {rationale: Build dependency.} From ad5363812af1bd1ae8b5da67733e0bdc44bf8eda Mon Sep 17 00:00:00 2001 From: mkocka Date: Sun, 14 May 2017 23:46:33 +0200 Subject: [PATCH 04/15] nginx changed to master --- php.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php.yaml b/php.yaml index 64d7e23..0130f9f 100644 --- a/php.yaml +++ b/php.yaml @@ -20,7 +20,7 @@ data: shared-userspace: f26 perl: f26 postgresql: f26 - nginx: f26 + nginx: master httpd: f26 requires: perl: f26 From 42838389f91cd3c124cf99062b5ef5480de805f8 Mon Sep 17 00:00:00 2001 From: mkocka Date: Sun, 14 May 2017 23:54:09 +0200 Subject: [PATCH 05/15] adding nginx as component --- php.yaml | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/php.yaml b/php.yaml index 0130f9f..315ee48 100644 --- a/php.yaml +++ b/php.yaml @@ -20,7 +20,7 @@ data: shared-userspace: f26 perl: f26 postgresql: f26 - nginx: master +# nginx: f26 httpd: f26 requires: perl: f26 @@ -44,6 +44,42 @@ data: rationale: php package. ref: f26 buildorder: 10 + nginx: + rationale: Provides API for this module. + ref: f26 + buildorder: 2 + gperftools: + rationale: dependency + ref: f26 + buildorder: 1 + libmnl: + rationale: dependency + ref: f26 + buildorder: 1 + libnetfilter_conntrack: + rationale: dependency + ref: f26 + buildorder: 1 + libnfnetlink: + rationale: dependency + ref: f26 + buildorder: 1 + libunwind: + rationale: dependency + ref: f26 + buildorder: 1 + libxkbcommon: + rationale: dependency + ref: f26 + buildorder: 1 + mailcap: + rationale: dependency + ref: f26 + buildorder: 1 + xkeyboard-config: + rationale: dependency + ref: f26 + buildorder: 1 # aspell: {rationale: Build dependency.} # curl: {rationale: Build dependency.} # enchant: {rationale: Build dependency.} From dcda12f9648f491c3e93a44def090e108af907d5 Mon Sep 17 00:00:00 2001 From: mkocka Date: Mon, 22 May 2017 10:58:48 +0200 Subject: [PATCH 06/15] removing s-u from build deps --- php.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php.yaml b/php.yaml index 315ee48..8cc1ad8 100644 --- a/php.yaml +++ b/php.yaml @@ -17,7 +17,7 @@ data: # base-runtime: f26 bootstrap: f26 common-build-dependencies: f26 - shared-userspace: f26 +# shared-userspace: f26 perl: f26 postgresql: f26 # nginx: f26 From d3d9b86c80175f2448f8c119f559a843ee6f65a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Wed, 24 May 2017 12:42:42 +0200 Subject: [PATCH 07/15] Rebuilding for f26 signing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Šabata From 04d4d21ae4b41f7b0c82a7e6d2d0610a03ed19e3 Mon Sep 17 00:00:00 2001 From: rpitonak Date: Fri, 2 Jun 2017 08:28:12 +0200 Subject: [PATCH 08/15] Initial commit --- README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..460adea --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# php +PHP is a widely-used open source general-purpose scripting language that is especially suited for web development. From eb79cb598b1d4eef2a0ca4ac0f7c195548ce3890 Mon Sep 17 00:00:00 2001 From: Radoslav Pitonak Date: Fri, 2 Jun 2017 08:41:37 +0200 Subject: [PATCH 09/15] fill content in README.md --- README.md | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 460adea..91a4fec 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,23 @@ -# php -PHP is a widely-used open source general-purpose scripting language that is especially suited for web development. +# php module + +[**Package DB** (owner)](https://admin.fedoraproject.org/pkgdb/package/modules/php/) | +[**F26 modulemd** (source)](http://pkgs.fedoraproject.org/cgit/modules/php.git/tree/php.yaml?h=f26) | +[**PDC** (result)](https://pdc.fedoraproject.org/rest_api/v1/unreleasedvariants/?active=True&variant_name=php) + + +PHP is a widely-used open source general-purpose scripting language that is especially suited for web development and can be embedded into HTML. + +## Current state + +| State | Description | +|-------|-------------| +| ✓ YES | **Build passes** in the infra (all build deps are ok) | +| ✓ YES | **Installs** on the Base Runtime (all runtime deps are ok) | +| ✗ NO | **No bootstrap** - uses only proper modules | +| ✗ NO | General **tests are in dist-git** | +| ✓ YES | General **tests pass** | +| ✗ NO | Meets the **Fedora Module Packaging Guidelines** | + +### Notes + +See [**PHP s2i image**](https://github.com/container-images/php) on github for more details. From f8c3b4db33778b4baf32af8c7924918d5c1e5630 Mon Sep 17 00:00:00 2001 From: Radoslav Pitonak Date: Thu, 8 Jun 2017 13:19:50 +0200 Subject: [PATCH 10/15] general tests for module --- .gitignore | 1 + Dockerfile | 8 +++++++ Makefile | 17 ++++++++++++++ tests/Makefile | 6 +++++ tests/config.yaml | 16 +++++++++++++ tests/sanity1.py | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 108 insertions(+) create mode 100644 Dockerfile create mode 100644 Makefile create mode 100644 tests/Makefile create mode 100644 tests/config.yaml create mode 100644 tests/sanity1.py diff --git a/.gitignore b/.gitignore index e69de29..5678398 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +*.idea* diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..3c2c116 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,8 @@ +FROM baseruntime/baseruntime:latest + +LABEL MAINTAINER Rado Pitonak + +RUN microdnf --nodocs install php && \ + microdnf -y clean all + +CMD bash diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..8b6941b --- /dev/null +++ b/Makefile @@ -0,0 +1,17 @@ +IMAGE_NAME = php + +MODULEMDURL=file://php.yaml + +default: run + +build: + docker build --tag=$(IMAGE_NAME) . + +run: build + docker run -d $(IMAGE_NAME) + +debug: build + docker run -it $(IMAGE_NAME) bash + +test: build + cd tests; MODULE=docker MODULEMD=$(MODULEMDURL) URL="docker=$(IMAGE_NAME)" make all diff --git a/tests/Makefile b/tests/Makefile new file mode 100644 index 0000000..8fd8ae7 --- /dev/null +++ b/tests/Makefile @@ -0,0 +1,6 @@ +MODULE_LINT=/usr/share/moduleframework/tools/modulelint.py +CMD=python -m avocado run --filter-by-tags=-WIP $(MODULE_LINT) *.py + +# +all: + $(CMD) diff --git a/tests/config.yaml b/tests/config.yaml new file mode 100644 index 0000000..a2c06a9 --- /dev/null +++ b/tests/config.yaml @@ -0,0 +1,16 @@ +document: modularity-testing +version: 1 +name: php +modulemd-url: http://pkgs.fedoraproject.org/cgit/modules/php.git/plain/php.yaml?h=f26 +service: + port: 8080 +packages: + rpms: + - php +module: + docker: + start: "docker run -it" + container: php + rpm: + repos: + - http://mirror.vutbr.cz/fedora/releases/26/Everything/x86_64/os/ diff --git a/tests/sanity1.py b/tests/sanity1.py new file mode 100644 index 0000000..4ed53a7 --- /dev/null +++ b/tests/sanity1.py @@ -0,0 +1,60 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# This Modularity Testing Framework helps you to write tests for modules +# Copyright (C) 2017 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# he Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Authors: Rado Pitonak +# + +from avocado import main +from avocado.core import exceptions +from moduleframework import module_framework + + +class SanityCheck(module_framework.AvocadoTest): + """ + :avocado: enable + """ + + def testPhpBinary(self): + """ + Simple sanity test + """ + + self.start() + self.run("ls /bin | grep php") + + def test2PHPVersion(self): + """ + Check if PHP is installed in correct version + """ + version = "7." + self.start() + self.run("php -v | grep {}".format(version)) + + def testScriptExecution(self): + """ + Execute simple PHP script from CLI + """ + output = "Hello world!" + self.start() + self.assertIn(output, self.run("php -r 'echo \"{}\";'".format(output)).stdout) + + +if __name__ == '__main__': + main() From 04de9907201172ddef3605c7e819af790171d84d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radoslav=20Pito=C5=88=C3=A1k?= Date: Fri, 9 Jun 2017 09:45:04 +0200 Subject: [PATCH 11/15] general tests in dist-git --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 91a4fec..06648e8 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ PHP is a widely-used open source general-purpose scripting language that is espe | ✓ YES | **Build passes** in the infra (all build deps are ok) | | ✓ YES | **Installs** on the Base Runtime (all runtime deps are ok) | | ✗ NO | **No bootstrap** - uses only proper modules | -| ✗ NO | General **tests are in dist-git** | +| ✓ YES | General **tests are in dist-git** | | ✓ YES | General **tests pass** | | ✗ NO | Meets the **Fedora Module Packaging Guidelines** | From 810faf7da880a8411e6a0faba11920b8410cad2e Mon Sep 17 00:00:00 2001 From: mkocka Date: Fri, 16 Jun 2017 11:48:44 +0200 Subject: [PATCH 12/15] removing nginx from components --- php.yaml | 38 +++++--------------------------------- 1 file changed, 5 insertions(+), 33 deletions(-) diff --git a/php.yaml b/php.yaml index 8cc1ad8..3c085c5 100644 --- a/php.yaml +++ b/php.yaml @@ -20,7 +20,7 @@ data: # shared-userspace: f26 perl: f26 postgresql: f26 -# nginx: f26 + nginx: f26 httpd: f26 requires: perl: f26 @@ -44,10 +44,10 @@ data: rationale: php package. ref: f26 buildorder: 10 - nginx: - rationale: Provides API for this module. - ref: f26 - buildorder: 2 +# nginx: +# rationale: Provides API for this module. +# ref: f26 +# buildorder: 2 gperftools: rationale: dependency ref: f26 @@ -80,31 +80,3 @@ data: rationale: dependency ref: f26 buildorder: 1 -# aspell: {rationale: Build dependency.} -# curl: {rationale: Build dependency.} -# enchant: {rationale: Build dependency.} -# exim: {rationale: Build dependency.} -# firebird: {rationale: Build dependency.} -# freetds: {rationale: Build dependency.} -# gd: {rationale: Build dependency.} -# httpd: {rationale: Build dependency.} -# icu: {rationale: Build dependency.} -# libedit: {rationale: Build dependency.} -# libmcrypt: {rationale: Build dependency.} -# libtool: {rationale: Build dependency.} -# libxml2: {rationale: Build dependency.} -# libxslt: {rationale: Build dependency.} -# net-snmp: {rationale: Build dependency.} -# nginx: {rationale: Build dependency.} -# opensmtpd: {rationale: Build dependency.} -# pcre: {rationale: Build dependency.} -# php: {rationale: Runtime dependency.} -# postfix: {rationale: Build dependency.} -# postgresql: {rationale: Build dependency.} -# recode: {rationale: Build dependency.} -# sendmail: {rationale: Build dependency.} -# sqlite: {rationale: Build dependency.} -# tidy: {rationale: Build dependency.} -# tokyocabinet: {rationale: Build dependency.} -# unixODBC: {rationale: Build dependency.} -# uw-imap: {rationale: Build dependency.} From 81e5f7b1371a724c77097dd2285ecdd778ca1a4b Mon Sep 17 00:00:00 2001 From: Jan Koscielniak Date: Mon, 26 Jun 2017 12:29:28 +0200 Subject: [PATCH 13/15] Add modulemd file --- php.yaml | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 php.yaml diff --git a/php.yaml b/php.yaml new file mode 100644 index 0000000..ac932b0 --- /dev/null +++ b/php.yaml @@ -0,0 +1,82 @@ +document: modulemd +version: 1 +data: + summary: PHP scripting language for creating dynamic web sites + description: PHP is an HTML-embedded scripting language. PHP attempts to make it + easy for developers to write dynamically generated web pages. PHP also + offers built-in database integration for several commercial and + non-commercial database management systems, so writing a + database-enabled webpage with PHP is fairly simple. The most common + use of PHP coding is probably as a replacement for CGI scripts. + The php package contains the module (often referred to as mod_php) + which adds support for the PHP language to Apache HTTP Server. + license: + module: [PHP and Zend and BSD] + dependencies: + buildrequires: +# base-runtime: f26 + bootstrap: f26 + common-build-dependencies: f26 +# shared-userspace: f26 + perl: f26 + postgresql: f26 + nginx: f26 + httpd: f26 + requires: + perl: f26 + shared-userspace: f26 + base-runtime: f26 + httpd: f26 + references: + community: https://docs.pagure.org/modularity/ + documentation: https://github.com/modularity-modules/php + tracker: https://github.com/modularity-modules/php + profiles: + default: + rpms: + - php + api: + rpms: + - php + components: + rpms: + php: + rationale: php package. + ref: f26 + buildorder: 10 +# nginx: +# rationale: Provides API for this module. +# ref: f26 +# buildorder: 2 + gperftools: + rationale: dependency + ref: f26 + buildorder: 1 + libmnl: + rationale: dependency + ref: f26 + buildorder: 1 + libnetfilter_conntrack: + rationale: dependency + ref: f26 + buildorder: 1 + libnfnetlink: + rationale: dependency + ref: f26 + buildorder: 1 + libunwind: + rationale: dependency + ref: f26 + buildorder: 1 + libxkbcommon: + rationale: dependency + ref: f26 + buildorder: 1 + mailcap: + rationale: dependency + ref: f26 + buildorder: 1 + xkeyboard-config: + rationale: dependency + ref: f26 + buildorder: 1 From 0794f3c68e6bdd5fd958bffd7fc64d495796744d Mon Sep 17 00:00:00 2001 From: mkocka Date: Tue, 27 Jun 2017 12:39:21 +0200 Subject: [PATCH 14/15] repairing conflicts --- php.yaml | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/php.yaml b/php.yaml index 3c085c5..257cb67 100644 --- a/php.yaml +++ b/php.yaml @@ -38,6 +38,21 @@ data: api: rpms: - php + filter: + rpms: + - php-dba + - php-devel + - php-enchant + - php-gd + - php-imap + - php-interbase + - php-mcrypt + - php-odbc + - php-pdo-dblib + - php-pspell + - php-recode + - php-snmp + - php-tidy components: rpms: php: @@ -48,10 +63,10 @@ data: # rationale: Provides API for this module. # ref: f26 # buildorder: 2 - gperftools: - rationale: dependency - ref: f26 - buildorder: 1 +# gperftools: +# rationale: dependency +# ref: f26 +# buildorder: 1 libmnl: rationale: dependency ref: f26 From 683691c4e74407a124868f6c7c4a63bac69c7e6b Mon Sep 17 00:00:00 2001 From: mkocka Date: Fri, 7 Jul 2017 15:07:02 +0200 Subject: [PATCH 15/15] removing conficting packages --- php.yaml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/php.yaml b/php.yaml index 257cb67..3f841e8 100644 --- a/php.yaml +++ b/php.yaml @@ -67,22 +67,22 @@ data: # rationale: dependency # ref: f26 # buildorder: 1 - libmnl: - rationale: dependency - ref: f26 - buildorder: 1 - libnetfilter_conntrack: - rationale: dependency - ref: f26 - buildorder: 1 - libnfnetlink: - rationale: dependency - ref: f26 - buildorder: 1 - libunwind: - rationale: dependency - ref: f26 - buildorder: 1 +# libmnl: +# rationale: dependency +# ref: f26 +# buildorder: 1 +# libnetfilter_conntrack: +# rationale: dependency +# ref: f26 +# buildorder: 1 +# libnfnetlink: +# rationale: dependency +# ref: f26 +# buildorder: 1 +# libunwind: +# rationale: dependency +# ref: f26 +# buildorder: 1 libxkbcommon: rationale: dependency ref: f26