From 881db04256e536c3e8b4d4e9412a89180ee713e75fcbe685fa13db7fef3c9f51 Mon Sep 17 00:00:00 2001 From: Bruce Rogers Date: Fri, 29 May 2015 19:38:22 +0000 Subject: [PATCH] Accepting request 308836 from home:jirislaby:branches:Virtualization gcc5 fixes OBS-URL: https://build.opensuse.org/request/show/308836 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=261 --- ...-rules.mak-Force-CFLAGS-for-all-obje.patch | 49 ++++ gcc5-ipxe-add-missing-const-qualifiers.patch | 34 +++ ...fusing-logic-inversion-in-an-ANI-var.patch | 226 ++++++++++++++++++ libcacard.changes | 7 + libcacard.spec | 2 + qemu-linux-user.changes | 7 + qemu-linux-user.spec | 2 + qemu-testsuite.changes | 9 + qemu-testsuite.spec | 9 + qemu.changes | 9 + qemu.spec | 9 + qemu.spec.in | 7 + 12 files changed, 370 insertions(+) create mode 100644 0042-rules.mak-Force-CFLAGS-for-all-obje.patch create mode 100644 gcc5-ipxe-add-missing-const-qualifiers.patch create mode 100644 gcc5-ipxe-ath9k-Remove-confusing-logic-inversion-in-an-ANI-var.patch diff --git a/0042-rules.mak-Force-CFLAGS-for-all-obje.patch b/0042-rules.mak-Force-CFLAGS-for-all-obje.patch new file mode 100644 index 0000000..edfcf7c --- /dev/null +++ b/0042-rules.mak-Force-CFLAGS-for-all-obje.patch @@ -0,0 +1,49 @@ +From 1ee4c809a6b037f6546582b0eee452b3fabacc9e Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Thu, 7 May 2015 14:55:15 +0800 +Subject: [PATCH] rules.mak: Force CFLAGS for all objects in DSO + +Because of the trick of process-archive-undefs, all .mo objects, even +with --enable-modules, are dependencies of executables. + +This breaks CFLAGS propogation because the compiling of module object +will happen too early before building for DSO. + +With GCC 5, the linking would fail because .o doesn't have -fPIC. Also, +BUILD_DSO will be missed. (module-common.o will have it, so the stamp +symbol was still liked in .so). + +Fix the problem by forcing the CFLAGS on individual .o-cflags during +unnest-vars. + +Reported-by: Alexander Graf +Signed-off-by: Fam Zheng +Cc: qemu-stable@nongnu.org # 2.3 +Message-Id: <1430981715-31465-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + rules.mak | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/rules.mak b/rules.mak +index 3a05627..aec27f8 100644 +--- a/rules.mak ++++ b/rules.mak +@@ -102,7 +102,8 @@ endif + %.o: %.dtrace + $(call quiet-command,dtrace -o $@ -G -s $<, " GEN $(TARGET_DIR)$@") + +-%$(DSOSUF): CFLAGS += -fPIC -DBUILD_DSO ++DSO_OBJ_CFLAGS := -fPIC -DBUILD_DSO ++module-common.o: CFLAGS += $(DSO_OBJ_CFLAGS) + %$(DSOSUF): LDFLAGS += $(LDFLAGS_SHARED) + %$(DSOSUF): %.mo + $(call LINK,$^) +@@ -351,6 +352,7 @@ define unnest-vars + # For non-module build, add -m to -y + $(if $(CONFIG_MODULES), + $(foreach o,$($v), ++ $(eval $($o-objs): CFLAGS += $(DSO_OBJ_CFLAGS)) + $(eval $o: $($o-objs))) + $(eval $(patsubst %-m,%-y,$v) += $($v)) + $(eval modules: $($v:%.mo=%$(DSOSUF))), diff --git a/gcc5-ipxe-add-missing-const-qualifiers.patch b/gcc5-ipxe-add-missing-const-qualifiers.patch new file mode 100644 index 0000000..ef7d5a8 --- /dev/null +++ b/gcc5-ipxe-add-missing-const-qualifiers.patch @@ -0,0 +1,34 @@ +From bf40b79734a070cea4dd4c74b50d3bf73fdc6061 Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Thu, 23 Apr 2015 13:33:25 +0200 +Subject: [PATCH] [build] Add missing "const" qualifiers + +This fixes "initialization discards 'const' qualifier from pointer +target type" warnings with GCC 5.1.0. + +Signed-off-by: Christian Hesse +Modified-by: Michael Brown +Signed-off-by: Michael Brown +--- + src/net/tls.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/net/tls.c b/src/net/tls.c +index 30ccc93..8f4bec7 100644 +--- a/src/net/tls.c ++++ b/src/net/tls.c +@@ -1637,9 +1637,9 @@ static int tls_new_handshake ( struct tls_session *tls, + uint8_t length[3]; + uint8_t payload[0]; + } __attribute__ (( packed )) *handshake = data; +- void *payload = &handshake->payload; ++ const void *payload = &handshake->payload; + size_t payload_len = tls_uint24 ( handshake->length ); +- void *next = ( payload + payload_len ); ++ const void *next = ( payload + payload_len ); + + /* Sanity check */ + if ( next > end ) { +-- +1.7.0.4 + diff --git a/gcc5-ipxe-ath9k-Remove-confusing-logic-inversion-in-an-ANI-var.patch b/gcc5-ipxe-ath9k-Remove-confusing-logic-inversion-in-an-ANI-var.patch new file mode 100644 index 0000000..c40e179 --- /dev/null +++ b/gcc5-ipxe-ath9k-Remove-confusing-logic-inversion-in-an-ANI-var.patch @@ -0,0 +1,226 @@ +From: Christian Hesse +Date: Thu, 23 Apr 2015 13:33:26 +0200 +Subject: [ath9k] Remove confusing logic inversion in an ANI variable +Patch-mainline: no + +This changed in Linux kernel the same way in commit 7067e701 +("ath9k_hw: remove confusing logic inversion in an ANI variable") by +Felix Fietkau. + +Additionally this fixes "error: logical not is only applied to the +left hand side of comparison" with GCC 5.1.0. + +Signed-off-by: Christian Hesse +Signed-off-by: Michael Brown +Signed-off-by: Jiri Slaby +--- + src/drivers/net/ath/ath9k/ani.h | 2 +- + src/drivers/net/ath/ath9k/ath9k_ani.c | 16 ++++++++-------- + src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c | 18 +++++++++--------- + src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c | 12 ++++++------ + 4 files changed, 24 insertions(+), 24 deletions(-) + +diff --git a/src/drivers/net/ath/ath9k/ani.h b/src/drivers/net/ath/ath9k/ani.h +index dbd4d4d5bc12..ba87ba0fd258 100644 +--- a/src/drivers/net/ath/ath9k/ani.h ++++ b/src/drivers/net/ath/ath9k/ani.h +@@ -125,7 +125,7 @@ struct ar5416AniState { + u8 mrcCCKOff; + u8 spurImmunityLevel; + u8 firstepLevel; +- u8 ofdmWeakSigDetectOff; ++ u8 ofdmWeakSigDetect; + u8 cckWeakSigThreshold; + u32 listenTime; + int32_t rssiThrLow; +diff --git a/src/drivers/net/ath/ath9k/ath9k_ani.c b/src/drivers/net/ath/ath9k/ath9k_ani.c +index ff7df497fc92..76ca79cba3e8 100644 +--- a/src/drivers/net/ath/ath9k/ath9k_ani.c ++++ b/src/drivers/net/ath/ath9k/ath9k_ani.c +@@ -177,7 +177,7 @@ static void ath9k_hw_ani_ofdm_err_trigger_old(struct ath_hw *ah) + + rssi = BEACON_RSSI(ah); + if (rssi > aniState->rssiThrHigh) { +- if (!aniState->ofdmWeakSigDetectOff) { ++ if (aniState->ofdmWeakSigDetect) { + if (ath9k_hw_ani_control(ah, + ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION, + 0)) { +@@ -192,7 +192,7 @@ static void ath9k_hw_ani_ofdm_err_trigger_old(struct ath_hw *ah) + return; + } + } else if (rssi > aniState->rssiThrLow) { +- if (aniState->ofdmWeakSigDetectOff) ++ if (!aniState->ofdmWeakSigDetect) + ath9k_hw_ani_control(ah, + ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION, + 1); +@@ -202,7 +202,7 @@ static void ath9k_hw_ani_ofdm_err_trigger_old(struct ath_hw *ah) + return; + } else { + if ((ah->dev->channels + ah->dev->channel)->band == NET80211_BAND_2GHZ) { +- if (!aniState->ofdmWeakSigDetectOff) ++ if (aniState->ofdmWeakSigDetect) + ath9k_hw_ani_control(ah, + ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION, + 0); +@@ -360,7 +360,7 @@ static void ath9k_hw_ani_lower_immunity_old(struct ath_hw *ah) + if (rssi > aniState->rssiThrHigh) { + /* XXX: Handle me */ + } else if (rssi > aniState->rssiThrLow) { +- if (aniState->ofdmWeakSigDetectOff) { ++ if (!aniState->ofdmWeakSigDetect) { + if (ath9k_hw_ani_control(ah, + ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION, + 1) == 1) +@@ -436,9 +436,9 @@ static void ath9k_ani_reset_old(struct ath_hw *ah) + if (aniState->spurImmunityLevel != 0) + ath9k_hw_ani_control(ah, ATH9K_ANI_SPUR_IMMUNITY_LEVEL, + aniState->spurImmunityLevel); +- if (aniState->ofdmWeakSigDetectOff) ++ if (!aniState->ofdmWeakSigDetect) + ath9k_hw_ani_control(ah, ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION, +- !aniState->ofdmWeakSigDetectOff); ++ aniState->ofdmWeakSigDetect); + if (aniState->cckWeakSigThreshold) + ath9k_hw_ani_control(ah, ATH9K_ANI_CCK_WEAK_SIGNAL_THR, + aniState->cckWeakSigThreshold); +@@ -709,8 +709,8 @@ void ath9k_hw_ani_init(struct ath_hw *ah) + + ani->rssiThrHigh = ATH9K_ANI_RSSI_THR_HIGH; + ani->rssiThrLow = ATH9K_ANI_RSSI_THR_LOW; +- ani->ofdmWeakSigDetectOff = +- !ATH9K_ANI_USE_OFDM_WEAK_SIG; ++ ani->ofdmWeakSigDetect = ++ ATH9K_ANI_USE_OFDM_WEAK_SIG; + ani->cckNoiseImmunityLevel = ATH9K_ANI_CCK_DEF_LEVEL; + } + +diff --git a/src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c b/src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c +index 60e87e9e2625..2b6c133cb783 100644 +--- a/src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c ++++ b/src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c +@@ -1141,12 +1141,12 @@ static int ar5008_hw_ani_control_old(struct ath_hw *ah, + REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW, + AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW); + +- if (!on != aniState->ofdmWeakSigDetectOff) { ++ if (on != aniState->ofdmWeakSigDetect) { + if (on) + ah->stats.ast_ani_ofdmon++; + else + ah->stats.ast_ani_ofdmoff++; +- aniState->ofdmWeakSigDetectOff = !on; ++ aniState->ofdmWeakSigDetect = on; + } + break; + } +@@ -1215,10 +1215,10 @@ static int ar5008_hw_ani_control_old(struct ath_hw *ah, + + DBG2("ath9k: ANI parameters:\n"); + DBG2( +- "noiseImmunityLevel=%d, spurImmunityLevel=%d, ofdmWeakSigDetectOff=%d\n", ++ "noiseImmunityLevel=%d, spurImmunityLevel=%d, ofdmWeakSigDetect=%d\n", + aniState->noiseImmunityLevel, + aniState->spurImmunityLevel, +- !aniState->ofdmWeakSigDetectOff); ++ aniState->ofdmWeakSigDetect); + DBG2( + "cckWeakSigThreshold=%d, firstepLevel=%d, listenTime=%d\n", + aniState->cckWeakSigThreshold, +@@ -1307,18 +1307,18 @@ static int ar5008_hw_ani_control_new(struct ath_hw *ah, + REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW, + AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW); + +- if (!on != aniState->ofdmWeakSigDetectOff) { ++ if (on != aniState->ofdmWeakSigDetect) { + DBG2("ath9k: " + "** ch %d: ofdm weak signal: %s=>%s\n", + chan->channel, +- !aniState->ofdmWeakSigDetectOff ? ++ aniState->ofdmWeakSigDetect ? + "on" : "off", + on ? "on" : "off"); + if (on) + ah->stats.ast_ani_ofdmon++; + else + ah->stats.ast_ani_ofdmoff++; +- aniState->ofdmWeakSigDetectOff = !on; ++ aniState->ofdmWeakSigDetect = on; + } + break; + } +@@ -1467,7 +1467,7 @@ static int ar5008_hw_ani_control_new(struct ath_hw *ah, + DBG2("ath9k: " + "ANI parameters: SI=%d, ofdmWS=%s FS=%d MRCcck=%s listenTime=%d ofdmErrs=%d cckErrs=%d\n", + aniState->spurImmunityLevel, +- !aniState->ofdmWeakSigDetectOff ? "on" : "off", ++ aniState->ofdmWeakSigDetect ? "on" : "off", + aniState->firstepLevel, + !aniState->mrcCCKOff ? "on" : "off", + aniState->listenTime, +@@ -1554,7 +1554,7 @@ static void ar5008_hw_ani_cache_ini_regs(struct ath_hw *ah) + /* these levels just got reset to defaults by the INI */ + aniState->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL_NEW; + aniState->firstepLevel = ATH9K_ANI_FIRSTEP_LVL_NEW; +- aniState->ofdmWeakSigDetectOff = !ATH9K_ANI_USE_OFDM_WEAK_SIG; ++ aniState->ofdmWeakSigDetect = ATH9K_ANI_USE_OFDM_WEAK_SIG; + aniState->mrcCCKOff = 1; /* not available on pre AR9003 */ + } + +diff --git a/src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c b/src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c +index 6103040abfb2..2244b775a6be 100644 +--- a/src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c ++++ b/src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c +@@ -859,18 +859,18 @@ static int ar9003_hw_ani_control(struct ath_hw *ah, + REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW, + AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW); + +- if (!on != aniState->ofdmWeakSigDetectOff) { ++ if (on != aniState->ofdmWeakSigDetect) { + DBG2("ath9k: " + "** ch %d: ofdm weak signal: %s=>%s\n", + chan->channel, +- !aniState->ofdmWeakSigDetectOff ? ++ aniState->ofdmWeakSigDetect ? + "on" : "off", + on ? "on" : "off"); + if (on) + ah->stats.ast_ani_ofdmon++; + else + ah->stats.ast_ani_ofdmoff++; +- aniState->ofdmWeakSigDetectOff = !on; ++ aniState->ofdmWeakSigDetect = on; + } + break; + } +@@ -1013,7 +1013,7 @@ static int ar9003_hw_ani_control(struct ath_hw *ah, + AR_PHY_MRC_CCK_ENABLE, is_on); + REG_RMW_FIELD(ah, AR_PHY_MRC_CCK_CTRL, + AR_PHY_MRC_CCK_MUX_REG, is_on); +- if (!is_on != aniState->mrcCCKOff) { ++ if (!(is_on != aniState->mrcCCKOff)) { + DBG2("ath9k: " + "** ch %d: MRC CCK: %s=>%s\n", + chan->channel, +@@ -1037,7 +1037,7 @@ static int ar9003_hw_ani_control(struct ath_hw *ah, + DBG2("ath9k: " + "ANI parameters: SI=%d, ofdmWS=%s FS=%d MRCcck=%s listenTime=%d ofdmErrs=%d cckErrs=%d\n", + aniState->spurImmunityLevel, +- !aniState->ofdmWeakSigDetectOff ? "on" : "off", ++ aniState->ofdmWeakSigDetect ? "on" : "off", + aniState->firstepLevel, + !aniState->mrcCCKOff ? "on" : "off", + aniState->listenTime, +@@ -1137,7 +1137,7 @@ static void ar9003_hw_ani_cache_ini_regs(struct ath_hw *ah) + /* these levels just got reset to defaults by the INI */ + aniState->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL_NEW; + aniState->firstepLevel = ATH9K_ANI_FIRSTEP_LVL_NEW; +- aniState->ofdmWeakSigDetectOff = !ATH9K_ANI_USE_OFDM_WEAK_SIG; ++ aniState->ofdmWeakSigDetect = ATH9K_ANI_USE_OFDM_WEAK_SIG; + aniState->mrcCCKOff = !ATH9K_ANI_ENABLE_MRC_CCK; + } + +-- +2.4.1 + diff --git a/libcacard.changes b/libcacard.changes index 4a18808..9293268 100644 --- a/libcacard.changes +++ b/libcacard.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue May 26 18:11:43 UTC 2015 - jslaby@suse.com + +- Patch queue updated from git://github.com/jirislaby/qemu.git opensuse-2.3 +* Patches added: + 0042-rules.mak-Force-CFLAGS-for-all-obje.patch + ------------------------------------------------------------------- Thu May 14 17:21:21 UTC 2015 - afaerber@suse.de diff --git a/libcacard.spec b/libcacard.spec index f175550..2b1723d 100644 --- a/libcacard.spec +++ b/libcacard.spec @@ -66,6 +66,7 @@ Patch0038: 0038-Revert-Revert-seccomp-tests-that-al.patch Patch0039: 0039-s390x-Fix-stoc-direction.patch Patch0040: 0040-s390x-Add-interlocked-access-facili.patch Patch0041: 0041-fdc-force-the-fifo-access-to-be-in-.patch +Patch0042: 0042-rules.mak-Force-CFLAGS-for-all-obje.patch # Please do not add patches manually here, run update_git.sh. # this is to make lint happy Source300: qemu-rpmlintrc @@ -166,6 +167,7 @@ This sub-package contains development files for the Smartcard library. %patch0039 -p1 %patch0040 -p1 %patch0041 -p1 +%patch0042 -p1 %build ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ diff --git a/qemu-linux-user.changes b/qemu-linux-user.changes index ddde15f..f948192 100644 --- a/qemu-linux-user.changes +++ b/qemu-linux-user.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue May 26 18:11:37 UTC 2015 - jslaby@suse.com + +- Patch queue updated from git://github.com/jirislaby/qemu.git opensuse-2.3 +* Patches added: + 0042-rules.mak-Force-CFLAGS-for-all-obje.patch + ------------------------------------------------------------------- Thu May 14 17:21:17 UTC 2015 - afaerber@suse.de diff --git a/qemu-linux-user.spec b/qemu-linux-user.spec index 05c6b52..0ac5940 100644 --- a/qemu-linux-user.spec +++ b/qemu-linux-user.spec @@ -66,6 +66,7 @@ Patch0038: 0038-Revert-Revert-seccomp-tests-that-al.patch Patch0039: 0039-s390x-Fix-stoc-direction.patch Patch0040: 0040-s390x-Add-interlocked-access-facili.patch Patch0041: 0041-fdc-force-the-fifo-access-to-be-in-.patch +Patch0042: 0042-rules.mak-Force-CFLAGS-for-all-obje.patch # Please do not add patches manually here, run update_git.sh. # this is to make lint happy Source300: qemu-rpmlintrc @@ -160,6 +161,7 @@ run cross-architecture builds. %patch0039 -p1 %patch0040 -p1 %patch0041 -p1 +%patch0042 -p1 %build ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes index 5054eb1..c2cec88 100644 --- a/qemu-testsuite.changes +++ b/qemu-testsuite.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue May 26 18:11:31 UTC 2015 - jslaby@suse.com + +- Patch queue updated from git://github.com/jirislaby/qemu.git opensuse-2.3 +* Patches added: + 0042-rules.mak-Force-CFLAGS-for-all-obje.patch + gcc5-ipxe-add-missing-const-qualifiers.patch + gcc5-ipxe-ath9k-Remove-confusing-logic-inversion-in-an-ANI-var.patch + ------------------------------------------------------------------- Thu May 14 17:21:13 UTC 2015 - afaerber@suse.de diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec index 781524a..280cf10 100644 --- a/qemu-testsuite.spec +++ b/qemu-testsuite.spec @@ -97,6 +97,7 @@ Patch0038: 0038-Revert-Revert-seccomp-tests-that-al.patch Patch0039: 0039-s390x-Fix-stoc-direction.patch Patch0040: 0040-s390x-Add-interlocked-access-facili.patch Patch0041: 0041-fdc-force-the-fifo-access-to-be-in-.patch +Patch0042: 0042-rules.mak-Force-CFLAGS-for-all-obje.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. @@ -108,6 +109,8 @@ Patch1000: seabios_128kb.patch Patch1001: seabios_checkrom_typo.patch Patch1002: seabios_avoid_smbios_signature_string.patch %endif +Patch1100: gcc5-ipxe-add-missing-const-qualifiers.patch +Patch1101: gcc5-ipxe-ath9k-Remove-confusing-logic-inversion-in-an-ANI-var.patch # this is to make lint happy Source300: qemu-rpmlintrc @@ -598,6 +601,7 @@ This package provides a service file for starting and stopping KSM. %patch0039 -p1 %patch0040 -p1 %patch0041 -p1 +%patch0042 -p1 %if %{build_x86_fw_from_source} pushd roms/seabios @@ -613,6 +617,11 @@ do done %endif +pushd roms/ipxe +%patch1100 -p1 +%patch1101 -p1 +popd + %build ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ --libdir=%_libdir \ diff --git a/qemu.changes b/qemu.changes index 5054eb1..c2cec88 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue May 26 18:11:31 UTC 2015 - jslaby@suse.com + +- Patch queue updated from git://github.com/jirislaby/qemu.git opensuse-2.3 +* Patches added: + 0042-rules.mak-Force-CFLAGS-for-all-obje.patch + gcc5-ipxe-add-missing-const-qualifiers.patch + gcc5-ipxe-ath9k-Remove-confusing-logic-inversion-in-an-ANI-var.patch + ------------------------------------------------------------------- Thu May 14 17:21:13 UTC 2015 - afaerber@suse.de diff --git a/qemu.spec b/qemu.spec index fa44b1d..f7e83fb 100644 --- a/qemu.spec +++ b/qemu.spec @@ -97,6 +97,7 @@ Patch0038: 0038-Revert-Revert-seccomp-tests-that-al.patch Patch0039: 0039-s390x-Fix-stoc-direction.patch Patch0040: 0040-s390x-Add-interlocked-access-facili.patch Patch0041: 0041-fdc-force-the-fifo-access-to-be-in-.patch +Patch0042: 0042-rules.mak-Force-CFLAGS-for-all-obje.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. @@ -108,6 +109,8 @@ Patch1000: seabios_128kb.patch Patch1001: seabios_checkrom_typo.patch Patch1002: seabios_avoid_smbios_signature_string.patch %endif +Patch1100: gcc5-ipxe-add-missing-const-qualifiers.patch +Patch1101: gcc5-ipxe-ath9k-Remove-confusing-logic-inversion-in-an-ANI-var.patch # this is to make lint happy Source300: qemu-rpmlintrc @@ -598,6 +601,7 @@ This package provides a service file for starting and stopping KSM. %patch0039 -p1 %patch0040 -p1 %patch0041 -p1 +%patch0042 -p1 %if %{build_x86_fw_from_source} pushd roms/seabios @@ -613,6 +617,11 @@ do done %endif +pushd roms/ipxe +%patch1100 -p1 +%patch1101 -p1 +popd + %build ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ --libdir=%_libdir \ diff --git a/qemu.spec.in b/qemu.spec.in index f7fe184..4cea8d3 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -68,6 +68,8 @@ Patch1000: seabios_128kb.patch Patch1001: seabios_checkrom_typo.patch Patch1002: seabios_avoid_smbios_signature_string.patch %endif +Patch1100: gcc5-ipxe-add-missing-const-qualifiers.patch +Patch1101: gcc5-ipxe-ath9k-Remove-confusing-logic-inversion-in-an-ANI-var.patch # this is to make lint happy Source300: qemu-rpmlintrc @@ -533,6 +535,11 @@ do done %endif +pushd roms/ipxe +%patch1100 -p1 +%patch1101 -p1 +popd + %build ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ --libdir=%_libdir \