From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2253 The PACKAGE_NAME variable description implies that 'make PACKAGE_NAME="foo" dist-all-rpms' will create a set of rpms with Name "foo". This, unfortunately, does not work. The PACKAGE_NAME variable must be first renamed to SPECPACKAGE_NAME to comply with the naming convention for Makefile variables that are passed into the kernel spec file. In addition to that there are several other cases where 'kernel' is hardcoded in the scripts and spec files. And lastly, the Makefile assumes that the kernel spec file is always called "kernel.spec". Fix these issues, and allow users to set the kernel rpm Name by setting SPECPACKAGE_NAME. Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx> --- redhat/configs/build_configs.sh | 8 +- redhat/configs/generate_all_configs.sh | 11 +- redhat/configs/process_configs.sh | 4 +- redhat/docs/kernel-naming.rst | 4 +- redhat/koji/Makefile | 4 +- redhat/scripts/genspec/genspec.sh | 1 + redhat/scripts/expand_srpm.sh | 2 +- redhat/scripts/rh-dist-git.sh | 14 ++-- redhat/self-test/data/centos-2585cf9dfaad.el7 | 5 +- redhat/self-test/data/centos-2585cf9dfaad.el7.spec | 1 + redhat/self-test/data/centos-2585cf9dfaad.fc25 | 5 +- redhat/self-test/data/centos-2585cf9dfaad.fc25.spec | 1 + redhat/self-test/data/centos-78e36f3b0dae.el7 | 5 +- redhat/self-test/data/centos-78e36f3b0dae.el7.spec | 1 + redhat/self-test/data/centos-78e36f3b0dae.fc25 | 5 +- redhat/self-test/data/centos-78e36f3b0dae.fc25.spec | 1 + redhat/self-test/data/centos-df0cc57e057f.el7 | 5 +- redhat/self-test/data/centos-df0cc57e057f.el7.spec | 1 + redhat/self-test/data/centos-df0cc57e057f.fc25 | 5 +- redhat/self-test/data/centos-df0cc57e057f.fc25.spec | 1 + redhat/self-test/data/centos-fce15c45d3fb.el7 | 5 +- redhat/self-test/data/centos-fce15c45d3fb.el7.spec | 1 + redhat/self-test/data/centos-fce15c45d3fb.fc25 | 5 +- redhat/self-test/data/centos-fce15c45d3fb.fc25.spec | 1 + redhat/self-test/data/fedora-2585cf9dfaad.el7 | 5 +- redhat/self-test/data/fedora-2585cf9dfaad.el7.spec | 1 + redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 5 +- redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec | 1 + redhat/self-test/data/fedora-78e36f3b0dae.el7 | 5 +- redhat/self-test/data/fedora-78e36f3b0dae.el7.spec | 1 + redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 5 +- redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec | 1 + redhat/self-test/data/fedora-df0cc57e057f.el7 | 5 +- redhat/self-test/data/fedora-df0cc57e057f.el7.spec | 1 + redhat/self-test/data/fedora-df0cc57e057f.fc25 | 5 +- redhat/self-test/data/fedora-df0cc57e057f.fc25.spec | 1 + redhat/self-test/data/fedora-fce15c45d3fb.el7 | 5 +- redhat/self-test/data/fedora-fce15c45d3fb.el7.spec | 1 + redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 5 +- redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec | 1 + redhat/self-test/data/rhel-2585cf9dfaad.el7 | 5 +- redhat/self-test/data/rhel-2585cf9dfaad.el7.spec | 1 + redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 5 +- redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec | 1 + redhat/self-test/data/rhel-78e36f3b0dae.el7 | 5 +- redhat/self-test/data/rhel-78e36f3b0dae.el7.spec | 1 + redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 5 +- redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec | 1 + redhat/self-test/data/rhel-df0cc57e057f.el7 | 5 +- redhat/self-test/data/rhel-df0cc57e057f.el7.spec | 1 + redhat/self-test/data/rhel-df0cc57e057f.fc25 | 5 +- redhat/self-test/data/rhel-df0cc57e057f.fc25.spec | 1 + redhat/self-test/data/rhel-fce15c45d3fb.el7 | 5 +- redhat/self-test/data/rhel-fce15c45d3fb.el7.spec | 1 + redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 5 +- redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec | 1 + redhat/Makefile | 34 ++++++--- redhat/Makefile.variables | 10 +- redhat/kernel.spec.template | 68 ++++++++++---------- 59 files changed, 183 insertions(+), 121 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, report it: https://pagure.io/fedora-infrastructure/new_issue
