commit f2fc35c278f9aa0d2e4535f4c73296e45923d573 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Tue Dec 24 18:43:03 2019 +0000 Update update_vbox.sh and ExclusiveArch x86_64 VirtualBox-kmod.spec | 4 +--- update_vbox.sh | 30 ++++++++++++++---------------- 2 files changed, 15 insertions(+), 19 deletions(-) --- diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec index 443b4c2..c6dd77e 100644 --- a/VirtualBox-kmod.spec +++ b/VirtualBox-kmod.spec @@ -60,8 +60,7 @@ Patch2: kernel-5.patch %global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time BuildRequires: %{AkmodsBuildRequires} -# needed for plague to make sure it builds for i586 and i686 -ExclusiveArch: i686 x86_64 +ExclusiveArch: x86_64 # get the proper build-sysbuild package from the repo, which # tracks in all the kernel-devel packages @@ -106,7 +105,6 @@ done %build for kernel_version in %{?kernel_versions}; do for module in vboxdrv %{!?with_newvboxsf:vboxguest}; do - make VBOX_USE_INSERT_PAGE=1 %{?_smp_mflags} KERN_DIR="${kernel_version##*___}" -C "${kernel_version##*___}" M="${PWD}/_kmod_build_${kernel_version%%___*}/${module}" modules done %if ! %{with newvboxsf} diff --git a/update_vbox.sh b/update_vbox.sh index 88c6241..a5b7a37 100755 --- a/update_vbox.sh +++ b/update_vbox.sh @@ -28,38 +28,36 @@ fi if test $stage -le 1 then echo STAGE 1 -BRANCH1=f31 -BRANCH2=fc31 +BRANCH1=f32 +BRANCH2=fc32 koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2 (koji-rpmfusion wait-repo $BRANCH1-free-build --build=VirtualBox-$VERSION-$REL.$BRANCH2 && \ rfpkg push && rfpkg build --nowait ) & -BRANCH1=f30 -BRANCH2=fc30 +fi +if test $stage -le 2 +then +echo STAGE 2 +BRANCH1=f31 +BRANCH2=fc31 echo Press enter tag-build $BRANCH1 to continue; read dummy; koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2 (koji-rpmfusion wait-repo $BRANCH1-free-build --build=VirtualBox-$VERSION-$REL.$BRANCH2 && \ git checkout $BRANCH1 && git merge master && git push && rfpkg build --nowait; git checkout master) & -BRANCH1=f29 -BRANCH2=fc29 +BRANCH1=f30 +BRANCH2=fc30 echo Press enter tag-build $BRANCH1 to continue; read dummy; koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2 (koji-rpmfusion wait-repo $BRANCH1-free-build --build=VirtualBox-$VERSION-$REL.$BRANCH2 && \ -git checkout $BRANCH1 && git merge master && git push && rfpkg build --nowait) & +git checkout $BRANCH1 && git merge master && git push && rfpkg build --nowait; git checkout master) & #koji-rpmfusion watch-task -#BRANCH1=f28 -#BRANCH2=fc28 -#echo Press enter tag-build $BRANCH1 to continue; read dummy; -#koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2 -#koji-rpmfusion wait-repo $BRANCH1-free-build --build=VirtualBox-$VERSION-$REL.$BRANCH2 -#git checkout $BRANCH1 && git merge master && git push && rfpkg build --nowait; git checkout master fi -if test $stage -le 2 +if test $stage -le 3 then -echo STAGE 2 -echo Press enter to continue; read dummy; +echo STAGE 3 BRANCH1=el7 BRANCH2=el7 +echo Press enter tag-build $BRANCH1 to continue; read dummy; koji-rpmfusion tag-build el7-free-override VirtualBox-$VERSION-$REL.el7 koji-rpmfusion wait-repo $BRANCH1-free-build --build=VirtualBox-$VERSION-$REL.$BRANCH2 git checkout $BRANCH1 && git merge master && git push && rfpkg build --nowait; git checkout master