From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757 Depends: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1728 This is a collection of various improvements and fixes for the redhat/Makefile variables. These fixes include renaming and reorganizing of variables, an explanation of how the kernel NVR is constructed, and fixing the dist-brew & distg-brew so they can be executed without specifying any extra variables. Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx> --- redhat/scripts/new_release.sh | 24 +-- redhat/scripts/rh-dist-git.sh | 2 +- redhat/self-test/data/centos-2585cf9dfaad.el7 | 15 +- redhat/self-test/data/centos-2585cf9dfaad.el7.spec | 65 ++++----- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 15 +- redhat/self-test/data/centos-2585cf9dfaad.fc25.spec | 65 ++++----- redhat/self-test/data/centos-78e36f3b0dae.el7 | 16 +- redhat/self-test/data/centos-78e36f3b0dae.el7.spec | 65 ++++----- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 16 +- redhat/self-test/data/centos-78e36f3b0dae.fc25.spec | 65 ++++----- redhat/self-test/data/centos-df0cc57e057f.el7 | 15 +- redhat/self-test/data/centos-df0cc57e057f.el7.spec | 65 ++++----- redhat/self-test/data/centos-df0cc57e057f.fc25 | 15 +- redhat/self-test/data/centos-df0cc57e057f.fc25.spec | 65 ++++----- redhat/self-test/data/centos-fce15c45d3fb.el7 | 16 +- redhat/self-test/data/centos-fce15c45d3fb.el7.spec | 65 ++++----- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 16 +- redhat/self-test/data/centos-fce15c45d3fb.fc25.spec | 65 ++++----- redhat/self-test/data/create-data.sh | 2 + redhat/self-test/data/fedora-2585cf9dfaad.el7 | 15 +- redhat/self-test/data/fedora-2585cf9dfaad.el7.spec | 65 ++++----- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 15 +- redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec | 65 ++++----- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 16 +- redhat/self-test/data/fedora-78e36f3b0dae.el7.spec | 65 ++++----- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 16 +- redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec | 65 ++++----- redhat/self-test/data/fedora-df0cc57e057f.el7 | 15 +- redhat/self-test/data/fedora-df0cc57e057f.el7.spec | 65 ++++----- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 15 +- redhat/self-test/data/fedora-df0cc57e057f.fc25.spec | 65 ++++----- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 16 +- redhat/self-test/data/fedora-fce15c45d3fb.el7.spec | 65 ++++----- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 16 +- redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec | 65 ++++----- redhat/self-test/data/rhel-2585cf9dfaad.el7 | 15 +- redhat/self-test/data/rhel-2585cf9dfaad.el7.spec | 65 ++++----- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 15 +- redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec | 65 ++++----- redhat/self-test/data/rhel-78e36f3b0dae.el7 | 16 +- redhat/self-test/data/rhel-78e36f3b0dae.el7.spec | 65 ++++----- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 16 +- redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec | 65 ++++----- redhat/self-test/data/rhel-df0cc57e057f.el7 | 15 +- redhat/self-test/data/rhel-df0cc57e057f.el7.spec | 65 ++++----- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 15 +- redhat/self-test/data/rhel-df0cc57e057f.fc25.spec | 65 ++++----- redhat/self-test/data/rhel-fce15c45d3fb.el7 | 16 +- redhat/self-test/data/rhel-fce15c45d3fb.el7.spec | 65 ++++----- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 16 +- redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec | 65 ++++----- redhat/Makefile | 132 +++++++++++-------- redhat/Makefile.cross | 28 ++-- redhat/Makefile.variables | 2 +- redhat/genspec.sh | 12 +- redhat/kernel.spec.template | 65 ++++----- 56 files changed, 1091 insertions(+), 1108 deletions(-) _______________________________________________ kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
