summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2012-01-17 14:03:10 -0500
committerDave Jones <davej@redhat.com>2012-01-17 14:03:10 -0500
commit96efdd95530325e0164f0fa007600b6e17b73294 (patch)
treec7bb5e288574cba322903507d0208ba30540fb22
parent8b6438f7bd85891b18a3cb90584c069bf5395f61 (diff)
downloadkernel-96efdd95530325e0164f0fa007600b6e17b73294.tar.gz
kernel-96efdd95530325e0164f0fa007600b6e17b73294.tar.xz
kernel-96efdd95530325e0164f0fa007600b6e17b73294.zip
Disable UAS when we switch back to release builds.
-rw-r--r--Makefile3
-rw-r--r--Makefile.release2
2 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index d60583204..933eb32b8 100644
--- a/Makefile
+++ b/Makefile
@@ -100,6 +100,9 @@ debug:
@perl -pi -e 's/CONFIG_NR_CPUS=256/CONFIG_NR_CPUS=512/' config-x86_64-generic
+ # Try out UAS in rawhide builds.
+ @perl -pi -e 's/# CONFIG_USB_UAS is not set/CONFIG_USB_UAS=m/' config-generic
+
@perl -pi -e 's/^%define debugbuildsenabled 1/%define debugbuildsenabled 0/' kernel.spec
@perl -pi -e 's/^%define rawhide_skip_docs 0/%define rawhide_skip_docs 1/' kernel.spec
@rpmdev-bumpspec -c "Reenable debugging options." kernel.spec
diff --git a/Makefile.release b/Makefile.release
index dbb28b3e6..f911ec650 100644
--- a/Makefile.release
+++ b/Makefile.release
@@ -76,3 +76,5 @@ config-release:
# Change defaults back to sane things.
@perl -pi -e 's/CONFIG_NR_CPUS=512/CONFIG_NR_CPUS=256/' config-x86_64-generic
+ # Disable UAS for release until it's ready.
+ @perl -pi -e 's/CONFIG_USB_UAS=m/# CONFIG_USB_UAS is not set/' config-generic