Skip to content
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

Jump to bottom

kernel: install module.lds file to arch/powerpc/kernel #273

Merged
merged 2 commits into from
Jul 26, 2018
Merged

kernel: install module.lds file to arch/powerpc/kernel #273

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
46b637c
kernel: install module.lds file to arch/powerpc/kernel
farosas Jul 24, 2018
e5a5a25
Update open-power-host-os dependencies
farosas Jul 25, 2018
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
11 changes: 7 additions & 4 deletions kernel/CentOS/7/kernel.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ Group: System Environment/Kernel
License: GPLv2
URL: http://www.kernel.org/
Version: 4.17.0
Release: 1%{?prerelease}%{?extraver}%{gitcommittag}%{?dist}
Release: 2%{?prerelease}%{?extraver}%{gitcommittag}%{?dist}
# DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
# SET %%nobuildarches (ABOVE) INSTEAD
ExclusiveArch: noarch i686 x86_64 ppc ppc64 ppc64le s390 s390x %{arm} ppcnf ppc476
Expand Down Expand Up @@ -1040,9 +1040,9 @@ BuildKernel() {
if [ -d arch/$Arch/scripts ]; then
cp -a arch/$Arch/scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch} || :
fi
if [ -f arch/$Arch/*lds ]; then
cp -a arch/$Arch/*lds $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch}/ || :
fi
for f in arch/$Arch/kernel/*lds; do
cp -a --parents $f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
done
rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*.o
rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*/*.o
%ifarch ppc64 ppc64le ppcnf ppc476
Expand Down Expand Up @@ -1698,6 +1698,9 @@ fi


%changelog
* Tue Jul 24 2018 Fabiano Rosas <farosas@linux.ibm.com> - 4.17.0-2.git
- Install module.lds to the correct location

* Mon Jun 11 2018 OpenPOWER Host OS Builds Bot <open-power-host-os-builds-bot@users.noreply.github.com> - 4.17.0-1.git
- Version update
- Updating to 5ce3eac Merge tag v4.17 into hostos-devel
Expand Down
15 changes: 9 additions & 6 deletions open-power-host-os/CentOS/7/open-power-host-os.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

Name: open-power-host-os
Version: 3.5
Release: 40%{?milestone_tag}%{dist}
Release: 41%{?milestone_tag}%{dist}
Summary: OpenPOWER Host OS metapackages
Group: System Environment/Base
License: GPLv3
Expand Down Expand Up @@ -50,7 +50,7 @@ BuildRequires: policycoreutils-python
Summary: OpenPOWER Host OS full package set

Requires: %{name}-base = %{version}-%{release}
Requires(post): kernel = 4.17.0-1%{?extraver}.git5ce3eac%{dist}
Requires(post): kernel = 4.17.0-2%{?extraver}.git5ce3eac%{dist}
Requires: %{name}-container = %{version}-%{release}
Requires(post): docker
Requires(post): docker-swarm = 1.1.0-3%{?extraver}.gita0fd82b
Expand Down Expand Up @@ -85,7 +85,7 @@ Summary: OpenPOWER Host OS basic packages

Requires: %{name}-release = %{version}-%{release}

Requires(post): kernel = 4.17.0-1%{?extraver}.git5ce3eac%{dist}
Requires(post): kernel = 4.17.0-2%{?extraver}.git5ce3eac%{dist}

Obsoletes: open-power-host-os-virt-management < 3.0-7

Expand All @@ -98,7 +98,7 @@ Obsoletes: open-power-host-os-virt-management < 3.0-7
Summary: OpenPOWER Host OS container packages

Requires: %{name}-base = %{version}-%{release}
Requires(post): kernel = 4.17.0-1%{?extraver}.git5ce3eac%{dist}
Requires(post): kernel = 4.17.0-2%{?extraver}.git5ce3eac%{dist}

Requires(post): docker
Requires(post): docker-swarm = 1.1.0-3%{?extraver}.gita0fd82b
Expand All @@ -114,7 +114,7 @@ Requires(post): kubernetes = 1.2.0-0.23%{?extraver}.git4a3f9c5%{dist}
Summary: OpenPOWER Host OS hypervisor packages

Requires: %{name}-base = %{version}-%{release}
Requires(post): kernel = 4.17.0-1%{?extraver}.git5ce3eac%{dist}
Requires(post): kernel = 4.17.0-2%{?extraver}.git5ce3eac%{dist}

Requires(post): SLOF = 20180621-1%{?extraver}.git7d37bab%{dist}
Requires(post): libvirt = 4.5.0-3%{?extraver}.gitb7c8ea8%{dist}
Expand All @@ -129,7 +129,7 @@ Requires(post): qemu = 15:2.12.0-2%{?extraver}.gitd36f3ee%{dist}
Summary: OpenPOWER Host OS RAS (Reliability Availability Serviceability) packages

Requires: %{name}-base = %{version}-%{release}
Requires(post): kernel = 4.17.0-1%{?extraver}.git5ce3eac%{dist}
Requires(post): kernel = 4.17.0-2%{?extraver}.git5ce3eac%{dist}

Requires(post): crash
Requires(post): hwdata = 0.288-3%{?extraver}.git625a119%{dist}
Expand Down Expand Up @@ -207,6 +207,9 @@ rm -rf $RPM_BUILD_ROOT


%changelog
* Wed Jul 25 2018 Fabiano Rosas <farosas@linux.ibm.com> - 3.5-41.dev
- Update package dependencies

* Wed Jul 18 2018 OpenPOWER Host OS Builds Bot <open-power-host-os-builds-bot@users.noreply.github.com> - 3.5-40.dev
- Update package dependencies

Expand Down