diff options
author | iap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk> | 2005-08-03 08:25:58 +0000 |
---|---|---|
committer | iap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk> | 2005-08-03 08:25:58 +0000 |
commit | e0c4ddb3965edb5f421d911b81dcb90968919ab9 (patch) | |
tree | 2f2ce3a1ecce5df5f0a4a0ca92e9452524d7cc99 /buildconfigs | |
parent | a8498f221a0fe859698e4b8550151174c3fac62d (diff) | |
download | xen-e0c4ddb3965edb5f421d911b81dcb90968919ab9.tar.gz xen-e0c4ddb3965edb5f421d911b81dcb90968919ab9.tar.bz2 xen-e0c4ddb3965edb5f421d911b81dcb90968919ab9.zip |
Since we use configs from dist/install/boot in preference to the default configs, update the PAE auto-switcher to work with these too.
Signed-off-by: ian@xensource.com
Diffstat (limited to 'buildconfigs')
-rw-r--r-- | buildconfigs/Rules.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk index 1455be04e9..97831bdfb0 100644 --- a/buildconfigs/Rules.mk +++ b/buildconfigs/Rules.mk @@ -115,7 +115,7 @@ config-update-pae: ifeq ($(XEN_TARGET_X86_PAE),y) sed -e 's!^CONFIG_HIGHMEM4G=y$$!\# CONFIG_HIGHMEM4G is not set!;s!^\# CONFIG_HIGHMEM64G is not set$$!CONFIG_HIGHMEM64G=y!' $(CONFIG_FILE) > $(CONFIG_FILE)- && mv $(CONFIG_FILE)- $(CONFIG_FILE) else - @: # do nothing yet + grep '^CONFIG_HIGHMEM64G=y' $(CONFIG_FILE) >/dev/null && sed -e 's!^CONFIG_HIGHMEM64G=y$$!\# CONFIG_HIGHMEM64G is not set!;s!^\# CONFIG_HIGHMEM4G is not set$$!CONFIG_HIGHMEM4G=y!' $(CONFIG_FILE) > $(CONFIG_FILE)- && mv $(CONFIG_FILE)- $(CONFIG_FILE) endif # never delete any intermediate files. |