Skip to content

Changes to make Fedora more similar to CentOS scripts #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 18, 2021
Merged

Changes to make Fedora more similar to CentOS scripts #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10202e1
Making it more similar to CentOS
tachoknight Oct 7, 2021
aee9e01
Merge branch 'apple:main' into main
tachoknight Oct 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions platforms/Linux/Fedora/34/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion platforms/Linux/Fedora/34/build_swift_rpm.sh → platforms/Linux/Fedora/34/build_rpm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 platforms/Linux/Fedora/34/nocyclades.patch → .../Linux/Fedora/34/patches/nocyclades.patch
View file
Open in desktop
File renamed without changes.
0 ...-circular-dependencies-optimization.patch → ...-circular-dependencies-optimization.patch
View file
Open in desktop
File renamed without changes.
0 ...orms/Linux/Fedora/34/unusedvariable.patch → ...ux/Fedora/34/patches/unusedvariable.patch
View file
Open in desktop
File renamed without changes.
46 changes: 0 additions & 46 deletions platforms/Linux/Fedora/34/swift-for-fedora.patch
View file
Open in desktop

This file was deleted.

651 changes: 13 additions & 638 deletions platforms/Linux/Fedora/34/swift-lang.spec
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 18 additions & 12 deletions platforms/Linux/Fedora/35/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion ...s/Linux/Fedora/rawhide/build_swift_rpm.sh → platforms/Linux/Fedora/35/build_rpm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 platforms/Linux/Fedora/35/nocyclades.patch → .../Linux/Fedora/35/patches/nocyclades.patch
View file
Open in desktop
File renamed without changes.
0 ...-circular-dependencies-optimization.patch → ...-circular-dependencies-optimization.patch
View file
Open in desktop
File renamed without changes.
0 ...orms/Linux/Fedora/35/unusedvariable.patch → ...ux/Fedora/35/patches/unusedvariable.patch
View file
Open in desktop
File renamed without changes.
46 changes: 0 additions & 46 deletions platforms/Linux/Fedora/35/swift-for-fedora.patch
View file
Open in desktop

This file was deleted.

Loading