Merge pull request swiftlang#34 from tachoknight/main

Changes to make Fedora more similar to CentOS scripts

Author: shahmishal

platforms/Linux/Fedora/34/Dockerfile

@@ -3,22 +3,28 @@ LABEL PURPOSE="This image is configured to build Swift for the version of Fedora
 
 WORKDIR /root
 
+RUN yum -y update
+
+# RPM and yum development tools
+RUN yum install -y rpmdevtools yum-utils
+
+# Add the spec
 RUN mkdir -p /root/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
 ADD swift-lang.spec /root/rpmbuild/SPECS/swift-lang.spec
-ADD *.patch /root/rpmbuild/SOURCES/
-
-ADD build_swift_rpm.sh /root/build_swift_rpm.sh
-RUN chmod +x /root/build_swift_rpm.sh
 
-RUN dnf -y update
 
-# Required for the "rpmbuild" command
-RUN dnf install -y fedora-packager fedora-review
+# Install all the dependencies needed to build Swift from the spec file itself
+RUN yum-builddep -y /root/rpmbuild/SPECS/swift-lang.spec
 
-# Install all the dependencies needed to build Swift from the
-# spec file itself
-RUN dnf builddep -y /root/rpmbuild/SPECS/swift-lang.spec
-# And now get the sources for Swift as defined in the spec file
+# Get the sources for Swift as defined in the spec file
 RUN spectool -g -R /root/rpmbuild/SPECS/swift-lang.spec
 
-CMD ["/root/build_swift_rpm.sh"]
+# Add the patches
+ADD patches/*.patch /root/rpmbuild/SOURCES/
+
+# Add the driver script
+ADD build_rpm.sh /root/build_rpm.sh
+RUN chmod +x /root/build_rpm.sh
+
+
+CMD ["/root/build_rpm.sh"]

platforms/Linux/Fedora/34/build_swift_rpm.sh renamed to platforms/Linux/Fedora/34/build_rpm.sh

@@ -13,7 +13,7 @@ then
 fi
 
 # Always make sure we're up to date
-dnf -y update
+yum -y update
 
 # Now we proceed to build Swift. If this is successful, we
 # will have two files: a SRPM file which contains the source files

platforms/Linux/Fedora/34/nocyclades.patch renamed to platforms/Linux/Fedora/34/patches/nocyclades.patch

@@ -3,22 +3,28 @@ LABEL PURPOSE="This image is configured to build Swift for the version of Fedora
 
 WORKDIR /root
 
+RUN yum -y update
+
+# RPM and yum development tools
+RUN yum install -y rpmdevtools yum-utils
+
+# Add the spec
 RUN mkdir -p /root/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
 ADD swift-lang.spec /root/rpmbuild/SPECS/swift-lang.spec
-ADD *.patch /root/rpmbuild/SOURCES/
-
-ADD build_swift_rpm.sh /root/build_swift_rpm.sh
-RUN chmod +x /root/build_swift_rpm.sh
 
-RUN dnf -y update
 
-# Required for the "rpmbuild" command
-RUN dnf install -y fedora-packager fedora-review
+# Install all the dependencies needed to build Swift from the spec file itself
+RUN yum-builddep -y /root/rpmbuild/SPECS/swift-lang.spec
 
-# Install all the dependencies needed to build Swift from the
-# spec file itself
-RUN dnf builddep -y /root/rpmbuild/SPECS/swift-lang.spec
-# And now get the sources for Swift as defined in the spec file
+# Get the sources for Swift as defined in the spec file
 RUN spectool -g -R /root/rpmbuild/SPECS/swift-lang.spec
 
-CMD ["/root/build_swift_rpm.sh"]
+# Add the patches
+ADD patches/*.patch /root/rpmbuild/SOURCES/
+
+# Add the driver script
+ADD build_rpm.sh /root/build_rpm.sh
+RUN chmod +x /root/build_rpm.sh
+
+
+CMD ["/root/build_rpm.sh"]

platforms/Linux/Fedora/34/pc-circular-dependencies-optimization.patch renamed to platforms/Linux/Fedora/34/patches/pc-circular-dependencies-optimization.patch

@@ -13,7 +13,7 @@ then
 fi
 
 # Always make sure we're up to date
-dnf -y update
+yum -y update
 
 # Now we proceed to build Swift. If this is successful, we
 # will have two files: a SRPM file which contains the source files