From d09225ac8d1e4536a39c69dcc9df815051b6a012 Mon Sep 17 00:00:00 2001 From: Jiri Vymazal Date: Tue, 25 Jul 2017 16:53:43 +0200 Subject: [PATCH 1/8] added api, components and dependencies --- rsyslog.yaml | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/rsyslog.yaml b/rsyslog.yaml index ab8ea84..b94c10e 100644 --- a/rsyslog.yaml +++ b/rsyslog.yaml @@ -14,6 +14,9 @@ data: dependencies: buildrequires: base-runtime: master + mongodb: f26 + mariadb: f26 + postgresql: f26 requires: base-runtime: master references: @@ -58,7 +61,46 @@ data: srpm-buildroot: rpms: - rsyslog + api: + rpms: + - rsyslog components: rpms: rsyslog: rationale: Base package of this module. + autoconf: + rationale: Dependency of rsyslog base. + automake: + rationale: Dependency of rsyslog base. + bison: + rationale: Dependency of rsyslog base. + dos2unix: + rationale: Dependency of rsyslog base. + hiredis: + rationale: Dependency of rsyslog base. + libdbi: + rationale: Dependency of rsyslog-libdbi rpm. + libee: + rationale: Dependency of rsyslog base. + libestr: + rationale: Dependency of rsyslog base. + libfastjson: + rationale: Dependency of rsyslog base. + liblogging: + rationale: Dependency of rsyslog base. + liblognorm: + rationale: Dependency of rsyslog-mmnormalize. + libnet: + rationale: Dependency of rsyslog base. + librabbitmq: + rationale: Dependency of rsyslog-rabbitmq. + librdkafka: + rationale: Dependency of rsyslog-kafka. + librelp: + rationale: Dependency of rsyslog-relp. + net-snmp: + rationale: Dependency of rsyslog base. + python-docutils: + rationale: Dependency of rsyslog base. + qpid-proton: + rationale: Dependency of rsyslog base. From 761765162d5423301d5ec2d8eeb6c2db2e30e133 Mon Sep 17 00:00:00 2001 From: Jiri Vymazal Date: Wed, 26 Jul 2017 10:14:55 +0200 Subject: [PATCH 2/8] added other dependencies and buildorder for components --- rsyslog.yaml | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/rsyslog.yaml b/rsyslog.yaml index b94c10e..c346138 100644 --- a/rsyslog.yaml +++ b/rsyslog.yaml @@ -14,6 +14,7 @@ data: dependencies: buildrequires: base-runtime: master + common-build-dependencies: f26 mongodb: f26 mariadb: f26 postgresql: f26 @@ -68,39 +69,52 @@ data: rpms: rsyslog: rationale: Base package of this module. - autoconf: - rationale: Dependency of rsyslog base. - automake: - rationale: Dependency of rsyslog base. + buildorder: 5 bison: rationale: Dependency of rsyslog base. + buildorder: 4 dos2unix: rationale: Dependency of rsyslog base. + buildorder: 4 hiredis: rationale: Dependency of rsyslog base. + buildorder: 4 libdbi: rationale: Dependency of rsyslog-libdbi rpm. + buildorder: 4 libee: rationale: Dependency of rsyslog base. + buildorder: 4 libestr: rationale: Dependency of rsyslog base. + buildorder: 4 libfastjson: rationale: Dependency of rsyslog base. + buildorder: 4 liblogging: rationale: Dependency of rsyslog base. + buildorder: 4 liblognorm: rationale: Dependency of rsyslog-mmnormalize. + buildorder: 4 libnet: rationale: Dependency of rsyslog base. + buildorder: 4 librabbitmq: rationale: Dependency of rsyslog-rabbitmq. + buildorder: 4 librdkafka: rationale: Dependency of rsyslog-kafka. + buildorder: 4 librelp: rationale: Dependency of rsyslog-relp. + buildorder: 4 net-snmp: rationale: Dependency of rsyslog base. + buildorder: 4 python-docutils: rationale: Dependency of rsyslog base. + buildorder: 4 qpid-proton: rationale: Dependency of rsyslog base. + buildorder: 4 From ebf7c433c0b32d84e44e2098dbe57307708ad1da Mon Sep 17 00:00:00 2001 From: Jiri Vymazal Date: Fri, 4 Aug 2017 11:47:25 +0200 Subject: [PATCH 3/8] Commit bump due to MBS architecture bug From 47fc31321077309f28abd9ee6cfb5c4210457d32 Mon Sep 17 00:00:00 2001 From: Jiri Vymazal Date: Fri, 4 Aug 2017 13:01:31 +0200 Subject: [PATCH 4/8] fixed dependency module streams, added/reorded few more RPMs, added mbs metadata to .gitignore --- .gitignore | 2 ++ rsyslog.yaml | 16 +++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e69de29..f0a1219 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,2 @@ +.mbs_local_build.db +~/* diff --git a/rsyslog.yaml b/rsyslog.yaml index c346138..44abbf1 100644 --- a/rsyslog.yaml +++ b/rsyslog.yaml @@ -13,8 +13,11 @@ data: module: [ MIT ] dependencies: buildrequires: - base-runtime: master + #for the meantime we use f26 stream even for master because master stream is usually broken/non-existent etc. + base-runtime: f26 common-build-dependencies: f26 + shared-userspace: f26 + perl: f26 mongodb: f26 mariadb: f26 postgresql: f26 @@ -86,11 +89,11 @@ data: rationale: Dependency of rsyslog base. buildorder: 4 libestr: - rationale: Dependency of rsyslog base. - buildorder: 4 + rationale: Dependency of liblognorm. + buildorder: 3 libfastjson: - rationale: Dependency of rsyslog base. - buildorder: 4 + rationale: Dependency of liblognorm. + buildorder: 3 liblogging: rationale: Dependency of rsyslog base. buildorder: 4 @@ -103,6 +106,9 @@ data: librabbitmq: rationale: Dependency of rsyslog-rabbitmq. buildorder: 4 + xmlto: + rationale: Dependency of librabbitmq. + buildorder: 3 librdkafka: rationale: Dependency of rsyslog-kafka. buildorder: 4 From 17705ebfdc07614e82d2887461c65d7e228fcdb7 Mon Sep 17 00:00:00 2001 From: Jiri Vymazal Date: Wed, 25 Oct 2017 12:22:28 +0200 Subject: [PATCH 5/8] scratch --- rsyslog.yaml | 72 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 43 insertions(+), 29 deletions(-) diff --git a/rsyslog.yaml b/rsyslog.yaml index 44abbf1..b248a11 100644 --- a/rsyslog.yaml +++ b/rsyslog.yaml @@ -13,16 +13,21 @@ data: module: [ MIT ] dependencies: buildrequires: - #for the meantime we use f26 stream even for master because master stream is usually broken/non-existent etc. - base-runtime: f26 - common-build-dependencies: f26 - shared-userspace: f26 - perl: f26 - mongodb: f26 - mariadb: f26 - postgresql: f26 + #uncomment all of these once we get rid of bootstrap + #autotools: f27 + #perl: master + #python2: master + #python3: master + #networking-base: master # provides net-snmp + #!!TEMPORARY!! - switch to master/upstream/etc. branch once varnish module gets updated !! + #varnish: f26 # provides jemalloc + #!!TEMPORARY!! - replace once - swig(boost) modularization is completea !! + bootstrap: master requires: - base-runtime: master + platform: f27 + mongodb: master + mariadb: master + postgresql: master references: community: http://www.rsyslog.com/ documentation: http://www.rsyslog.com/doc/master/index.html @@ -73,18 +78,24 @@ data: rsyslog: rationale: Base package of this module. buildorder: 5 - bison: - rationale: Dependency of rsyslog base. - buildorder: 4 - dos2unix: - rationale: Dependency of rsyslog base. - buildorder: 4 + #bison: + #rationale: Dependency of rsyslog base. + #buildorder: 4 hiredis: - rationale: Dependency of rsyslog base. + rationale: Dependency of rsyslog-hiredis rpm. buildorder: 4 + #redis: + #rationale: Dependency of hiredis. + #buildorder: 3 libdbi: rationale: Dependency of rsyslog-libdbi rpm. - buildorder: 4 + buildorder: 4 + #openjade: + #rationale: Dependency of libdbi + #buildorder: 3 + #opensp: + #rationale: Dependency of openjade + #buildorder: 2 libee: rationale: Dependency of rsyslog base. buildorder: 4 @@ -97,6 +108,9 @@ data: liblogging: rationale: Dependency of rsyslog base. buildorder: 4 + #dos2unix: + #rationale: Dependency of liblogging and rsyslog base. + #buildorder: 3 liblognorm: rationale: Dependency of rsyslog-mmnormalize. buildorder: 4 @@ -106,21 +120,21 @@ data: librabbitmq: rationale: Dependency of rsyslog-rabbitmq. buildorder: 4 - xmlto: - rationale: Dependency of librabbitmq. - buildorder: 3 + #xmlto: + #rationale: Dependency of librabbitmq. + #buildorder: 3 librdkafka: rationale: Dependency of rsyslog-kafka. buildorder: 4 librelp: rationale: Dependency of rsyslog-relp. buildorder: 4 - net-snmp: - rationale: Dependency of rsyslog base. - buildorder: 4 - python-docutils: - rationale: Dependency of rsyslog base. - buildorder: 4 - qpid-proton: - rationale: Dependency of rsyslog base. - buildorder: 4 + #python-sphinx: + #rationale: Dependency of librelp. + #buildorder: 3 + #python-docutils: + #rationale: Dependency of rsyslog base. + #buildorder: 4 + #qpid-proton: + #rationale: Dependency of rsyslog base. + #buildorder: 4 From 566111d537bd3e75a7a168b919c267833f8ccf96 Mon Sep 17 00:00:00 2001 From: Jiri Vymazal Date: Mon, 27 Nov 2017 14:41:01 +0100 Subject: [PATCH 6/8] switched bootstrap to correct stream --- rsyslog.yaml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/rsyslog.yaml b/rsyslog.yaml index b248a11..333b85a 100644 --- a/rsyslog.yaml +++ b/rsyslog.yaml @@ -18,15 +18,15 @@ data: #perl: master #python2: master #python3: master - #networking-base: master # provides net-snmp + networking-base: master # provides net-snmp and mariabd-client #!!TEMPORARY!! - switch to master/upstream/etc. branch once varnish module gets updated !! #varnish: f26 # provides jemalloc - #!!TEMPORARY!! - replace once - swig(boost) modularization is completea !! - bootstrap: master + #!!TEMPORARY!! - replace once - swig(boost) modularization is completed !! + bootstrap: f27 requires: platform: f27 mongodb: master - mariadb: master + mariadb: 10.2 postgresql: master references: community: http://www.rsyslog.com/ @@ -129,12 +129,15 @@ data: librelp: rationale: Dependency of rsyslog-relp. buildorder: 4 + libmongo-client: + rationale: Dependency of rsyslog-mongodb. + buildorder: 4 #python-sphinx: #rationale: Dependency of librelp. #buildorder: 3 #python-docutils: #rationale: Dependency of rsyslog base. #buildorder: 4 - #qpid-proton: - #rationale: Dependency of rsyslog base. - #buildorder: 4 + qpid-proton: + rationale: Dependency of rsyslog base. + buildorder: 4 From 848a88b093f197ed2d48b67ba35a03f7aa7b1977 Mon Sep 17 00:00:00 2001 From: Jiri Vymazal Date: Tue, 5 Dec 2017 12:50:37 +0100 Subject: [PATCH 7/8] changed dependency module streams to not mix master and f27 platform --- rsyslog.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/rsyslog.yaml b/rsyslog.yaml index 333b85a..14fbfe3 100644 --- a/rsyslog.yaml +++ b/rsyslog.yaml @@ -18,16 +18,17 @@ data: #perl: master #python2: master #python3: master - networking-base: master # provides net-snmp and mariabd-client + networking-base: f27 # provides net-snmp and mariabd-client #!!TEMPORARY!! - switch to master/upstream/etc. branch once varnish module gets updated !! #varnish: f26 # provides jemalloc #!!TEMPORARY!! - replace once - swig(boost) modularization is completed !! bootstrap: f27 + mariadb-connector-c: 3.0 requires: platform: f27 - mongodb: master - mariadb: 10.2 - postgresql: master + mongodb: 3.4 + #mariadb: 10.2 + postgresql: 9.6 references: community: http://www.rsyslog.com/ documentation: http://www.rsyslog.com/doc/master/index.html @@ -133,8 +134,8 @@ data: rationale: Dependency of rsyslog-mongodb. buildorder: 4 #python-sphinx: - #rationale: Dependency of librelp. - #buildorder: 3 + rationale: Dependency of librelp. + buildorder: 3 #python-docutils: #rationale: Dependency of rsyslog base. #buildorder: 4 From dc704bfc4f6a70a4020b4ceb0e25ed9a6e877059 Mon Sep 17 00:00:00 2001 From: Jiri Vymazal Date: Fri, 8 Dec 2017 11:18:11 +0100 Subject: [PATCH 8/8] bump because of MBS bug