From 5deb6c7c347f9b142d02427fce695a1fc3ec2f55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Fri, 12 May 2017 15:13:47 +0200 Subject: [PATCH 01/16] Point to f26 streams, duh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Šabata --- dnf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dnf.yaml b/dnf.yaml index 3e959f3..aa5e938 100644 --- a/dnf.yaml +++ b/dnf.yaml @@ -7,9 +7,9 @@ data: module: [ MIT ] dependencies: buildrequires: - bootstrap: master + bootstrap: f26 requires: - base-runtime: master + base-runtime: f26 references: community: https://fedoraproject.org/wiki/BaseRuntime documentation: https://github.com/fedora-modularity/base-runtime From c2d020b13971bb3775922fe28c6c5a223aa48ee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Tue, 16 May 2017 09:46:23 +0200 Subject: [PATCH 02/16] Fix a typo and filter libreport-devel out properly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Šabata --- dnf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnf.yaml b/dnf.yaml index aa5e938..b9c6244 100644 --- a/dnf.yaml +++ b/dnf.yaml @@ -38,7 +38,7 @@ data: python2-libcomps, # libreport libreport, libreport-anaconda, libreport-centos, - libreport-cli, libreport-compat, librepot-devel, + libreport-cli, libreport-compat, libreport-devel, libreport-fedora, libreport-gtk, libreport-gtk-devel, libreport-newt, libreport-plugin-bugzilla, libreport-plugin-kerneloops, libreport-plugin-logger, From b3490890ee95ee87f55b86a6da816db1ec9b8781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Tue, 16 May 2017 11:12:22 +0200 Subject: [PATCH 03/16] Bump to work around MBS issues. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Šabata From ad5104248c1428f6ad3eed784140c999b39017e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Tue, 6 Jun 2017 10:40:20 +0200 Subject: [PATCH 04/16] libreport is provided by shared-userspace now MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Šabata --- dnf.yaml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/dnf.yaml b/dnf.yaml index b9c6244..06ce94c 100644 --- a/dnf.yaml +++ b/dnf.yaml @@ -10,6 +10,8 @@ data: bootstrap: f26 requires: base-runtime: f26 + # provides libreport-filesystem + shared-userspace: f26 references: community: https://fedoraproject.org/wiki/BaseRuntime documentation: https://github.com/fedora-modularity/base-runtime @@ -23,8 +25,6 @@ data: # libcomps libcomps, libcomps-devel, libcomps-doc, python-libcomps-doc, python3-libcomps, - # libreport - libreport-filesystem, # python-iniparse python3-iniparse, ] @@ -36,17 +36,6 @@ data: drpmsync, python2-deltarpm, # libcomps python2-libcomps, - # libreport - libreport, libreport-anaconda, libreport-centos, - libreport-cli, libreport-compat, libreport-devel, - libreport-fedora, libreport-gtk, libreport-gtk-devel, - libreport-newt, libreport-plugin-bugzilla, - libreport-plugin-kerneloops, libreport-plugin-logger, - libreport-plugin-mailx, libreport-plugin-mantisbt, - libreport-plugin-reportuploader, libreport-plugin-rhtsupport, - libreport-plugin-systemd-journal, libreport-plugin-ureport, - libreport-python, libreport-python3, libreport-web, - libreport-web-devel, # python-iniparse python2-iniparse, ] @@ -64,10 +53,6 @@ data: libcomps: rationale: A dependency of python3-dnf ref: b6ea96bdc5f8d6cacb52d5e4af71330f5b163d2d - # librepo-1.7.20-5.fc26 - libreport: - rationale: A dependency of dnf-conf - ref: b730895e1c6c071a493aad90d0b3967ad078e0f3 # python-iniparse-0.4-24.fc26 python-iniparse: rationale: A dependency of python3-dnf From e34ca54af1959ff35046e5e8e8ff98b95a51b667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Mon, 12 Jun 2017 17:12:28 +0200 Subject: [PATCH 05/16] Package libreport-python3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Anaconda needs this. Having it here prevents a circular dependency between dnf and shared-userspace. Signed-off-by: Petr Šabata --- dnf.yaml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dnf.yaml b/dnf.yaml index 06ce94c..58ada82 100644 --- a/dnf.yaml +++ b/dnf.yaml @@ -10,7 +10,7 @@ data: bootstrap: f26 requires: base-runtime: f26 - # provides libreport-filesystem + # provides libreport bits shared-userspace: f26 references: community: https://fedoraproject.org/wiki/BaseRuntime @@ -25,6 +25,8 @@ data: # libcomps libcomps, libcomps-devel, libcomps-doc, python-libcomps-doc, python3-libcomps, + # libreport + libreport-python3, # python-iniparse python3-iniparse, ] @@ -36,6 +38,16 @@ data: drpmsync, python2-deltarpm, # libcomps python2-libcomps, + # libreport + libreport, libreport, libreport-anaconda, libreport-centos, + libreport-cli, libreport-compat, libreport-debuginfo, + libreport-devel, libreport-fedora, libreport-filesystem, + libreport-gtk, libreport-gtk-devel, libreport-newt, + libreport-plugin-bugzilla, libreport-plugin-kerneloops, + libreport-plugin-logger, libreport-plugin-mailx, + libreport-plugin-mantisbt, libreport-plugin-reportuploader, + libreport-plugin-rhtsupport, libreport-plugin-systemd-journal, + libreport-plugin-ureport, libreport-python, # python-iniparse python2-iniparse, ] @@ -53,6 +65,10 @@ data: libcomps: rationale: A dependency of python3-dnf ref: b6ea96bdc5f8d6cacb52d5e4af71330f5b163d2d + # libreport-2.9.1-2.fc26 + libreport: + rationale: Python bindings required by Anaconda. + ref: ea83325b231f64c575ea104bb698e9d43b80469a # python-iniparse-0.4-24.fc26 python-iniparse: rationale: A dependency of python3-dnf From 70a99271d33db2bb35c79cf0bb9a2c62548646cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Tue, 13 Jun 2017 13:53:26 +0200 Subject: [PATCH 06/16] Also filter out libreport-web* MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was omitted by mistake. Signed-off-by: Petr Šabata --- dnf.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dnf.yaml b/dnf.yaml index 58ada82..b25d1f6 100644 --- a/dnf.yaml +++ b/dnf.yaml @@ -47,7 +47,8 @@ data: libreport-plugin-logger, libreport-plugin-mailx, libreport-plugin-mantisbt, libreport-plugin-reportuploader, libreport-plugin-rhtsupport, libreport-plugin-systemd-journal, - libreport-plugin-ureport, libreport-python, + libreport-plugin-ureport, libreport-python, libreport-web, + libreport-web-devel, # python-iniparse python2-iniparse, ] From 2935f339ab261e762c2ebe39ccb513b2bb48671c Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 13 Jul 2017 12:04:14 +0200 Subject: [PATCH 07/16] add filters for modulemd and smartcols, add API --- dnf.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dnf.yaml b/dnf.yaml index 2774710..5a3fe19 100644 --- a/dnf.yaml +++ b/dnf.yaml @@ -27,8 +27,12 @@ data: python3-libcomps, # libreport libreport-python3, + # modulemd + python3-modulemd, # python-iniparse python3-iniparse, + # python-smartcols + python3-smartcols, ] filter: rpms: [ @@ -49,8 +53,12 @@ data: libreport-plugin-rhtsupport, libreport-plugin-systemd-journal, libreport-plugin-ureport, libreport-python, libreport-web, libreport-web-devel, + # modulemd + python2-modulemd, # python-iniparse python2-iniparse, + # python-smartcols + python2-smartcols, python-smartcols-doc, ] components: rpms: From 0c33b10bcc967d4cdd452f843093169f3bc62772 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 13 Jul 2017 12:08:24 +0200 Subject: [PATCH 08/16] don't filter python-smartcols-doc --- dnf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnf.yaml b/dnf.yaml index 5a3fe19..ee2546d 100644 --- a/dnf.yaml +++ b/dnf.yaml @@ -58,7 +58,7 @@ data: # python-iniparse python2-iniparse, # python-smartcols - python2-smartcols, python-smartcols-doc, + python2-smartcols, ] components: rpms: From a1981d44032b2452ebcf93e2f1a62dfd2565f9b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Thu, 13 Jul 2017 13:31:31 +0200 Subject: [PATCH 09/16] Bumping for the new libdnf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Šabata From 87f2e4ac97c1bac25360ae8b97b60fc26231fc39 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 17 Jul 2017 11:00:02 +0200 Subject: [PATCH 10/16] fixes in grammar parser Signed-off-by: Igor Gnatenko --- dnf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dnf.yaml b/dnf.yaml index ee2546d..7b29fa3 100644 --- a/dnf.yaml +++ b/dnf.yaml @@ -66,10 +66,10 @@ data: deltarpm: rationale: A dependency of python3-dnf ref: 6c36433c34e1c8afac4cc56460c4ef7c561e26ab - # dnf-2.6.0-1.git.40 + # dnf-2.6.0-2.git.40 dnf: rationale: The DNF package manager. - ref: de5a9d289353849edd144aeb6fab85a4937cd4e8 + ref: c410e812a057c38aca1d064a993089f21316d7c4 buildorder: 10 # libcomps-0.1.8-3.fc26 libcomps: From 33241fa83b0b0f22f985b0c1ac1d6ab111883496 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Mon, 17 Jul 2017 15:30:16 +0200 Subject: [PATCH 11/16] use latest commit in boltron branch --- dnf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnf.yaml b/dnf.yaml index 7b29fa3..29f6a5c 100644 --- a/dnf.yaml +++ b/dnf.yaml @@ -69,7 +69,7 @@ data: # dnf-2.6.0-2.git.40 dnf: rationale: The DNF package manager. - ref: c410e812a057c38aca1d064a993089f21316d7c4 + ref: 70a99271d33db2bb35c79cf0bb9a2c62548646cc buildorder: 10 # libcomps-0.1.8-3.fc26 libcomps: From d23ae4c2835313661938befa2c1ec6aa4e4d59c3 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Mon, 17 Jul 2017 15:39:08 +0200 Subject: [PATCH 12/16] Revert "use latest commit in boltron branch" This reverts commit 33241fa83b0b0f22f985b0c1ac1d6ab111883496. --- dnf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnf.yaml b/dnf.yaml index 29f6a5c..7b29fa3 100644 --- a/dnf.yaml +++ b/dnf.yaml @@ -69,7 +69,7 @@ data: # dnf-2.6.0-2.git.40 dnf: rationale: The DNF package manager. - ref: 70a99271d33db2bb35c79cf0bb9a2c62548646cc + ref: c410e812a057c38aca1d064a993089f21316d7c4 buildorder: 10 # libcomps-0.1.8-3.fc26 libcomps: From b2ab6afab4a984d31e67b04892623857ce118919 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 17 Jul 2017 18:43:07 +0200 Subject: [PATCH 13/16] It compiles! Ship it! Signed-off-by: Igor Gnatenko --- dnf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnf.yaml b/dnf.yaml index 7b29fa3..4f08872 100644 --- a/dnf.yaml +++ b/dnf.yaml @@ -69,7 +69,7 @@ data: # dnf-2.6.0-2.git.40 dnf: rationale: The DNF package manager. - ref: c410e812a057c38aca1d064a993089f21316d7c4 + ref: efd7dfa60547a19879f70ee4d534ed1d5d240d72 buildorder: 10 # libcomps-0.1.8-3.fc26 libcomps: From 59a6f6669c2a4bc56bed90718580c8222c6091fa Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 17 Jul 2017 20:34:09 +0200 Subject: [PATCH 14/16] this should fix it Signed-off-by: Igor Gnatenko --- dnf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dnf.yaml b/dnf.yaml index 4f08872..b9fa4fd 100644 --- a/dnf.yaml +++ b/dnf.yaml @@ -66,10 +66,10 @@ data: deltarpm: rationale: A dependency of python3-dnf ref: 6c36433c34e1c8afac4cc56460c4ef7c561e26ab - # dnf-2.6.0-2.git.40 + # dnf-2.6.0-3.git.40 dnf: rationale: The DNF package manager. - ref: efd7dfa60547a19879f70ee4d534ed1d5d240d72 + ref: d5f244230e2863cf75de78c4c88eedc79558b481 buildorder: 10 # libcomps-0.1.8-3.fc26 libcomps: From 44e62508b578348556a3935ef6568fd161f709f1 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Tue, 18 Jul 2017 11:01:30 +0200 Subject: [PATCH 15/16] add default profile --- dnf.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dnf.yaml b/dnf.yaml index b9fa4fd..4357cf7 100644 --- a/dnf.yaml +++ b/dnf.yaml @@ -16,6 +16,14 @@ data: community: https://fedoraproject.org/wiki/BaseRuntime documentation: https://github.com/fedora-modularity/base-runtime tracker: https://github.com/fedora-modularity/base-runtime/issues + profiles: + default: + rpms: + - dnf + - python3-dnf + - dnf-conf + - deltarpm + - libreport-filesystem api: rpms: [ # dnf: From 479bb0550bb2625abeada2768d967689d581845f Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Tue, 18 Jul 2017 11:07:03 +0200 Subject: [PATCH 16/16] put only dnf in rpm list, let the tools figure out the deps --- dnf.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dnf.yaml b/dnf.yaml index 4357cf7..c215f08 100644 --- a/dnf.yaml +++ b/dnf.yaml @@ -20,10 +20,6 @@ data: default: rpms: - dnf - - python3-dnf - - dnf-conf - - deltarpm - - libreport-filesystem api: rpms: [ # dnf: