From: Prarit Bhargava <[email protected]> self-test/data/create-data.sh: Avoid SINGLE_TARBALL warning
'make dist-self-test-data' outputs the warning "Makefile:25: WARNING: SINGLE_TARBALL will be deprecated in a later release." Unset the parameter before the make calls. Signed-off-by: Prarit Bhargava <[email protected]> diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 b/redhat/self-test/data/centos-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.el7 +++ b/redhat/self-test/data/centos-2585cf9dfaad.el7 @@ -98,4 +98,4 @@ RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= RHSELFTESTDATA= -SINGLE_TARBALL=0 +SINGLE_TARBALL= diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 b/redhat/self-test/data/centos-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25 @@ -98,4 +98,4 @@ RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= RHSELFTESTDATA= -SINGLE_TARBALL=0 +SINGLE_TARBALL= diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 b/redhat/self-test/data/centos-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.el7 +++ b/redhat/self-test/data/centos-78e36f3b0dae.el7 @@ -99,4 +99,4 @@ RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= RHSELFTESTDATA= -SINGLE_TARBALL=0 +SINGLE_TARBALL= diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 b/redhat/self-test/data/centos-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25 @@ -99,4 +99,4 @@ RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= RHSELFTESTDATA= -SINGLE_TARBALL=0 +SINGLE_TARBALL= diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 b/redhat/self-test/data/centos-df0cc57e057f.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.el7 +++ b/redhat/self-test/data/centos-df0cc57e057f.el7 @@ -98,4 +98,4 @@ RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= RHSELFTESTDATA= -SINGLE_TARBALL=0 +SINGLE_TARBALL= diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25 b/redhat/self-test/data/centos-df0cc57e057f.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.fc25 +++ b/redhat/self-test/data/centos-df0cc57e057f.fc25 @@ -98,4 +98,4 @@ RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= RHSELFTESTDATA= -SINGLE_TARBALL=0 +SINGLE_TARBALL= diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7 b/redhat/self-test/data/centos-fce15c45d3fb.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-fce15c45d3fb.el7 +++ b/redhat/self-test/data/centos-fce15c45d3fb.el7 @@ -99,4 +99,4 @@ RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= RHSELFTESTDATA= -SINGLE_TARBALL=0 +SINGLE_TARBALL= diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25 b/redhat/self-test/data/centos-fce15c45d3fb.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-fce15c45d3fb.fc25 +++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25 @@ -99,4 +99,4 @@ RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= RHSELFTESTDATA= -SINGLE_TARBALL=0 +SINGLE_TARBALL= diff --git a/redhat/self-test/data/create-data.sh b/redhat/self-test/data/create-data.sh index blahblah..blahblah 100755 --- a/redhat/self-test/data/create-data.sh +++ b/redhat/self-test/data/create-data.sh @@ -29,6 +29,7 @@ do # UPSTREAM is the base merge commit and can change from day-to-day as # the tree is changed. Omit UPSTREAM from the output. # RHEL_RELEASE can change build-to-build. + unset SINGLE_TARBALL make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}" HEAD=${commit} dist-dump-variables | grep "=" | grep -v CURDIR | grep -v -w UPSTREAM | grep -v -w RHEL_RELEASE >& "${varfilename}" # When executed from a script, the variables in Makefile.variables are @@ -47,6 +48,7 @@ do done >> "${varfilename}" echo "building ${varfilename}.spec" + unset SINGLE_TARBALL make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}" HEAD=${commit} setup-source cp "${SOURCES}"/kernel.spec "${varfilename}".spec done diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7 b/redhat/self-test/data/fedora-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-2585cf9dfaad.el7 +++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7 @@ -96,4 +96,4 @@ RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= RHSELFTESTDATA= -SINGLE_TARBALL=0 +SINGLE_TARBALL= diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25 b/redhat/self-test/data/fedora-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25 @@ -96,4 +96,4 @@ RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= RHSELFTESTDATA= -SINGLE_TARBALL=0 +SINGLE_TARBALL= diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7 b/redhat/self-test/data/fedora-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-78e36f3b0dae.el7 +++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7 @@ -97,4 +97,4 @@ RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= RHSELFTESTDATA= -SINGLE_TARBALL=0 +SINGLE_TARBALL= diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25 b/redhat/self-test/data/fedora-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25 @@ -97,4 +97,4 @@ RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= RHSELFTESTDATA= -SINGLE_TARBALL=0 +SINGLE_TARBALL= diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7 b/redhat/self-test/data/fedora-df0cc57e057f.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-df0cc57e057f.el7 +++ b/redhat/self-test/data/fedora-df0cc57e057f.el7 @@ -96,4 +96,4 @@ RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= RHSELFTESTDATA= -SINGLE_TARBALL=0 +SINGLE_TARBALL= diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25 b/redhat/self-test/data/fedora-df0cc57e057f.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-df0cc57e057f.fc25 +++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25 @@ -96,4 +96,4 @@ RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= RHSELFTESTDATA= -SINGLE_TARBALL=0 +SINGLE_TARBALL= diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7 b/redhat/self-test/data/fedora-fce15c45d3fb.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-fce15c45d3fb.el7 +++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7 @@ -97,4 +97,4 @@ RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= RHSELFTESTDATA= -SINGLE_TARBALL=0 +SINGLE_TARBALL= diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25 b/redhat/self-test/data/fedora-fce15c45d3fb.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-fce15c45d3fb.fc25 +++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25 @@ -97,4 +97,4 @@ RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= RHSELFTESTDATA= -SINGLE_TARBALL=0 +SINGLE_TARBALL= diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.el7 b/redhat/self-test/data/rhel-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/rhel-2585cf9dfaad.el7 +++ b/redhat/self-test/data/rhel-2585cf9dfaad.el7 @@ -96,4 +96,4 @@ RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= RHSELFTESTDATA= -SINGLE_TARBALL=0 +SINGLE_TARBALL= diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.fc25 b/redhat/self-test/data/rhel-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/rhel-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/rhel-2585cf9dfaad.fc25 @@ -96,4 +96,4 @@ RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= RHSELFTESTDATA= -SINGLE_TARBALL=0 +SINGLE_TARBALL= diff --git a/redhat/self-test/data/rhel-78e36f3b0dae.el7 b/redhat/self-test/data/rhel-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/rhel-78e36f3b0dae.el7 +++ b/redhat/self-test/data/rhel-78e36f3b0dae.el7 @@ -97,4 +97,4 @@ RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= RHSELFTESTDATA= -SINGLE_TARBALL=0 +SINGLE_TARBALL= -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757 _______________________________________________ kernel mailing list -- [email protected] To unsubscribe send an email to [email protected] 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/[email protected] Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
