Added support for QEMU Westmere

Makefile

@@ -11,8 +11,9 @@ boot-orange-pi-pc-plus: boot-armv7
 boot-raspberry-pi-3-b: boot-armv8
 boot-qemu-kvm64: boot-x86_64
 boot-qemu-core2duo: boot-x86_64
-boot-qemu-sandybridge: boot-x86_64
 boot-qemu-nehalem: boot-x86_64
+boot-qemu-westmere: boot-x86_64
+boot-qemu-sandybridge: boot-x86_64
 boot-x4-945: boot-x86_64
 boot-e2-6110: boot-x86_64
 boot-p4-630: boot-x86_64
@@ -187,12 +188,12 @@ rpi3b:
 	rm -rf /kernelconfig
 	rm -rf linux-4.14.36
 
-kvm64-clfs:
+core2duo-clfs:
 	tar xf linux-4.14.36.tar.xz
 	patch -Np1 -d linux-4.14.36 < linux-4.14.36-gcc8.patch
 	$(MAKE) -C linux-4.14.36 defconfig
 	/kernelconfig/initramfs/prepare
-	bash -c 'files=`ls -1 /kernelconfig/qemu-kvm64` ; for config in $$files ; do cat /kernelconfig/qemu-kvm64/$$config >> linux-4.14.36/.config ; done'
+	bash -c 'files=`ls -1 /kernelconfig/qemu-core2duo` ; for config in $$files ; do cat /kernelconfig/qemu-core2duo/$$config >> linux-4.14.36/.config ; done'
 	$(MAKE) -C linux-4.14.36 oldconfig
 	$(MAKE) -C linux-4.14.36
 	$(MAKE) -C linux-4.14.36 modules_install
@@ -204,12 +205,12 @@ kvm64-clfs:
 	rm -rf /kernelconfig
 	rm -rf linux-4.14.36
 
-kvm64:
+core2duo:
 	tar xf linux-4.14.36.tar.xz
 	patch -Np1 -d linux-4.14.36 < linux-4.14.36-gcc8.patch
 	cp -v /boot/config-4.14.36 linux-4.14.36/.config
 	/kernelconfig/initramfs/prepare
-	bash -c 'files=`ls -1 /kernelconfig/qemu-kvm64` ; for config in $$files ; do cat /kernelconfig/qemu-kvm64/$$config >> linux-4.14.36/.config ; done'
+	bash -c 'files=`ls -1 /kernelconfig/qemu-core2duo` ; for config in $$files ; do cat /kernelconfig/qemu-core2duo/$$config >> linux-4.14.36/.config ; done'
 	$(MAKE) -C linux-4.14.36 oldconfig
 	$(MAKE) -C linux-4.14.36
 	rm -rf /lib/modules
@@ -224,12 +225,12 @@ kvm64:
 	rm -rf /kernelconfig
 	rm -rf linux-4.14.36
 
-core2duo-clfs:
+nehalem-clfs:
 	tar xf linux-4.14.36.tar.xz
 	patch -Np1 -d linux-4.14.36 < linux-4.14.36-gcc8.patch
 	$(MAKE) -C linux-4.14.36 defconfig
 	/kernelconfig/initramfs/prepare
-	bash -c 'files=`ls -1 /kernelconfig/qemu-core2duo` ; for config in $$files ; do cat /kernelconfig/qemu-core2duo/$$config >> linux-4.14.36/.config ; done'
+	bash -c 'files=`ls -1 /kernelconfig/qemu-nehalem` ; for config in $$files ; do cat /kernelconfig/qemu-nehalem/$$config >> linux-4.14.36/.config ; done'
 	$(MAKE) -C linux-4.14.36 oldconfig
 	$(MAKE) -C linux-4.14.36
 	$(MAKE) -C linux-4.14.36 modules_install
@@ -241,12 +242,12 @@ core2duo-clfs:
 	rm -rf /kernelconfig
 	rm -rf linux-4.14.36
 
-core2duo:
+nehalem:
 	tar xf linux-4.14.36.tar.xz
 	patch -Np1 -d linux-4.14.36 < linux-4.14.36-gcc8.patch
 	cp -v /boot/config-4.14.36 linux-4.14.36/.config
 	/kernelconfig/initramfs/prepare
-	bash -c 'files=`ls -1 /kernelconfig/qemu-core2duo` ; for config in $$files ; do cat /kernelconfig/qemu-core2duo/$$config >> linux-4.14.36/.config ; done'
+	bash -c 'files=`ls -1 /kernelconfig/qemu-nehalem` ; for config in $$files ; do cat /kernelconfig/qemu-nehalem/$$config >> linux-4.14.36/.config ; done'
 	$(MAKE) -C linux-4.14.36 oldconfig
 	$(MAKE) -C linux-4.14.36
 	rm -rf /lib/modules
@@ -261,12 +262,12 @@ core2duo:
 	rm -rf /kernelconfig
 	rm -rf linux-4.14.36
 
-sandybridge-clfs:
+westmere-clfs:
 	tar xf linux-4.14.36.tar.xz
 	patch -Np1 -d linux-4.14.36 < linux-4.14.36-gcc8.patch
 	$(MAKE) -C linux-4.14.36 defconfig
 	/kernelconfig/initramfs/prepare
-	bash -c 'files=`ls -1 /kernelconfig/qemu-sandybridge` ; for config in $$files ; do cat /kernelconfig/qemu-sandybridge/$$config >> linux-4.14.36/.config ; done'
+	bash -c 'files=`ls -1 /kernelconfig/qemu-westmere` ; for config in $$files ; do cat /kernelconfig/qemu-westmere/$$config >> linux-4.14.36/.config ; done'
 	$(MAKE) -C linux-4.14.36 oldconfig
 	$(MAKE) -C linux-4.14.36
 	$(MAKE) -C linux-4.14.36 modules_install
@@ -278,12 +279,12 @@ sandybridge-clfs:
 	rm -rf /kernelconfig
 	rm -rf linux-4.14.36
 
-sandybridge:
+westmere:
 	tar xf linux-4.14.36.tar.xz
 	patch -Np1 -d linux-4.14.36 < linux-4.14.36-gcc8.patch
 	cp -v /boot/config-4.14.36 linux-4.14.36/.config
 	/kernelconfig/initramfs/prepare
-	bash -c 'files=`ls -1 /kernelconfig/qemu-sandybridge` ; for config in $$files ; do cat /kernelconfig/qemu-sandybridge/$$config >> linux-4.14.36/.config ; done'
+	bash -c 'files=`ls -1 /kernelconfig/qemu-westmere` ; for config in $$files ; do cat /kernelconfig/qemu-westmere/$$config >> linux-4.14.36/.config ; done'
 	$(MAKE) -C linux-4.14.36 oldconfig
 	$(MAKE) -C linux-4.14.36
 	rm -rf /lib/modules
@@ -298,12 +299,12 @@ sandybridge:
 	rm -rf /kernelconfig
 	rm -rf linux-4.14.36
 
-nehalem-clfs:
+sandybridge-clfs:
 	tar xf linux-4.14.36.tar.xz
 	patch -Np1 -d linux-4.14.36 < linux-4.14.36-gcc8.patch
 	$(MAKE) -C linux-4.14.36 defconfig
 	/kernelconfig/initramfs/prepare
-	bash -c 'files=`ls -1 /kernelconfig/qemu-nehalem` ; for config in $$files ; do cat /kernelconfig/qemu-nehalem/$$config >> linux-4.14.36/.config ; done'
+	bash -c 'files=`ls -1 /kernelconfig/qemu-sandybridge` ; for config in $$files ; do cat /kernelconfig/qemu-sandybridge/$$config >> linux-4.14.36/.config ; done'
 	$(MAKE) -C linux-4.14.36 oldconfig
 	$(MAKE) -C linux-4.14.36
 	$(MAKE) -C linux-4.14.36 modules_install
@@ -315,12 +316,12 @@ nehalem-clfs:
 	rm -rf /kernelconfig
 	rm -rf linux-4.14.36
 
-nehalem:
+sandybridge:
 	tar xf linux-4.14.36.tar.xz
 	patch -Np1 -d linux-4.14.36 < linux-4.14.36-gcc8.patch
 	cp -v /boot/config-4.14.36 linux-4.14.36/.config
 	/kernelconfig/initramfs/prepare
-	bash -c 'files=`ls -1 /kernelconfig/qemu-nehalem` ; for config in $$files ; do cat /kernelconfig/qemu-nehalem/$$config >> linux-4.14.36/.config ; done'
+	bash -c 'files=`ls -1 /kernelconfig/qemu-sandybridge` ; for config in $$files ; do cat /kernelconfig/qemu-sandybridge/$$config >> linux-4.14.36/.config ; done'
 	$(MAKE) -C linux-4.14.36 oldconfig
 	$(MAKE) -C linux-4.14.36
 	rm -rf /lib/modules

build.xml

@@ -221,11 +221,15 @@ CONFIG_CROSS_COMPILE="${CLFS_TARGET}"
   <ant antfile="packages/linux/build.xml" target="boot-linux-x86_64"/>
  </target>
 
- <target name="boot-linux-qemu-sandybridge">
+ <target name="boot-linux-qemu-nehalem">
   <ant antfile="packages/linux/build.xml" target="boot-linux-x86_64"/>
  </target>
 
- <target name="boot-linux-qemu-nehalem">
+ <target name="boot-linux-qemu-westmere">
+  <ant antfile="packages/linux/build.xml" target="boot-linux-x86_64"/>
+ </target>
+
+ <target name="boot-linux-qemu-sandybridge">
   <ant antfile="packages/linux/build.xml" target="boot-linux-x86_64"/>
  </target>