From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1727 Depends: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1647 One of the common complaints about the redhat Makefiles, genspec.sh, and kernel.spec.template is that it is not possible to determine which variables are being used in the Makefiles and which are being used in the kernel.spec.template. This changeset introduces a convention of prefixing all variables used in the kernel.spec.template with SPEC so that knowledgeable readers can track variable use and see how variable changes affect the kernel spec file. Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx> --- redhat/configs/generate_all_configs.sh | 2 +- redhat/docs/makefile-changes.rst | 8 +- redhat/scripts/create-tarball.sh | 5 +- redhat/scripts/rh-dist-git.sh | 4 +- redhat/self-test/data/centos-2585cf9dfaad.el7 | 26 ++-- redhat/self-test/data/centos-2585cf9dfaad.el7.spec | 26 ++-- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 26 ++-- redhat/self-test/data/centos-2585cf9dfaad.fc25.spec | 26 ++-- redhat/self-test/data/centos-78e36f3b0dae.el7 | 24 ++-- redhat/self-test/data/centos-78e36f3b0dae.el7.spec | 26 ++-- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 24 ++-- redhat/self-test/data/centos-78e36f3b0dae.fc25.spec | 26 ++-- redhat/self-test/data/centos-df0cc57e057f.el7 | 26 ++-- redhat/self-test/data/centos-df0cc57e057f.el7.spec | 26 ++-- redhat/self-test/data/centos-df0cc57e057f.fc25 | 26 ++-- redhat/self-test/data/centos-df0cc57e057f.fc25.spec | 26 ++-- redhat/self-test/data/centos-fce15c45d3fb.el7 | 24 ++-- redhat/self-test/data/centos-fce15c45d3fb.el7.spec | 26 ++-- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 24 ++-- redhat/self-test/data/centos-fce15c45d3fb.fc25.spec | 26 ++-- redhat/self-test/data/fedora-2585cf9dfaad.el7 | 26 ++-- redhat/self-test/data/fedora-2585cf9dfaad.el7.spec | 26 ++-- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 26 ++-- redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec | 26 ++-- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 24 ++-- redhat/self-test/data/fedora-78e36f3b0dae.el7.spec | 26 ++-- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 24 ++-- redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec | 26 ++-- redhat/self-test/data/fedora-df0cc57e057f.el7 | 26 ++-- redhat/self-test/data/fedora-df0cc57e057f.el7.spec | 26 ++-- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 26 ++-- redhat/self-test/data/fedora-df0cc57e057f.fc25.spec | 26 ++-- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 24 ++-- redhat/self-test/data/fedora-fce15c45d3fb.el7.spec | 26 ++-- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 24 ++-- redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec | 26 ++-- redhat/self-test/data/rhel-2585cf9dfaad.el7 | 26 ++-- redhat/self-test/data/rhel-2585cf9dfaad.el7.spec | 26 ++-- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 26 ++-- redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec | 26 ++-- redhat/self-test/data/rhel-78e36f3b0dae.el7 | 24 ++-- redhat/self-test/data/rhel-78e36f3b0dae.el7.spec | 26 ++-- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 24 ++-- redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec | 26 ++-- redhat/self-test/data/rhel-df0cc57e057f.el7 | 26 ++-- redhat/self-test/data/rhel-df0cc57e057f.el7.spec | 26 ++-- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 26 ++-- redhat/self-test/data/rhel-df0cc57e057f.fc25.spec | 26 ++-- redhat/self-test/data/rhel-fce15c45d3fb.el7 | 24 ++-- redhat/self-test/data/rhel-fce15c45d3fb.el7.spec | 26 ++-- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 24 ++-- redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec | 26 ++-- redhat/self-test/1006-verify-SPEC-variables.bats | 25 ++++ redhat/Makefile | 109 +++++++++++-------- redhat/Makefile.variables | 2 +- redhat/genspec.sh | 70 ++++++------ redhat/kernel.spec.template | 54 ++++---- redhat/rpminspect.yaml | 2 +- redhat/update_scripts.sh | 2 +- 59 files changed, 779 insertions(+), 728 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
