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.

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

build/ops: rpm: Revert "ceph.spec: work around build.opensuse.org" #21716

Merged
merged 1 commit into from Apr 30, 2018

Conversation

Projects
None yet
3 participants
@smithfarm
Copy link
Contributor

commented Apr 28, 2018

This reverts commit 21d941e which introduced a
"kludge" to make 32-bit x86 builds work in the openSUSE Build Service (OBS).

The OBS no longer uses i386 in RPM_OPT_FLAGS when the i586 build target is
specified. The current value of RPM_OPT_FLAGS for i586 is:

-fomit-frame-pointer -fmessage-length=0 -grecord-gcc-switches -O2 -Wall
-D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables
-fasynchronous-unwind-tables -fstack-clash-protection -g

(Side note: we are not currently building Ceph for any 32-bit architectures
in the OBS, and there are no plans to start doing so. That doesn't mean it
won't ever happen, but even if it does, this "kludge" will not be needed.)

Signed-off-by: Nathan Cutler ncutler@suse.com

Conflicts:
ceph.spec.in

Revert "ceph.spec: work around build.opensuse.org"
This reverts commit 21d941e which introduced a
"kludge" to make 32-bit x86 builds work in the openSUSE Build Service (OBS).

The OBS no longer uses i386 in RPM_OPT_FLAGS when the i586 build target is
specified. The current value of RPM_OPT_FLAGS for i586 is:

-fomit-frame-pointer -fmessage-length=0 -grecord-gcc-switches -O2 -Wall
-D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables
-fasynchronous-unwind-tables -fstack-clash-protection -g

(Side note: we are not currently building Ceph for any 32-bit architectures
in the OBS, and there are no plans to start doing so. That doesn't mean it
won't ever happen, but even if it does, this "kludge" will not be needed.)

Signed-off-by: Nathan Cutler <ncutler@suse.com>

Conflicts:
	ceph.spec.in

@smithfarm smithfarm requested review from tchaikov, liewegas, ktdreyer and ddiss Apr 28, 2018

@smithfarm smithfarm changed the title Revert "ceph.spec: work around build.opensuse.org" build/ops: rpm: Revert "ceph.spec: work around build.opensuse.org" Apr 28, 2018

@ddiss

ddiss approved these changes Apr 30, 2018

Copy link
Contributor

left a comment

Looks fine to me. Although I wasn't able to find a reference to the change in OBS behaviour.

@ktdreyer ktdreyer merged commit fb5cf54 into ceph:master Apr 30, 2018

5 checks passed

Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
make check (arm64) make check succeeded
Details

ktdreyer added a commit that referenced this pull request Apr 30, 2018

Merge pull request #21716 from smithfarm/wip-drop-obs-kludge
build/ops: rpm: Revert "ceph.spec: work around build.opensuse.org"

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: David Disseldorp <ddiss@suse.de>

@smithfarm smithfarm deleted the smithfarm:wip-drop-obs-kludge branch Jul 4, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.