Index: /branches/rel_apv_10_7/GNUmakefile =================================================================== --- /branches/rel_apv_10_7/GNUmakefile (revision 38122) +++ /branches/rel_apv_10_7/GNUmakefile (working copy) @@ -9,7 +9,7 @@ UINET_SDK=${CLICK_LIB}/libuinet-atcp MAKESYSPATH=${CURDIR}/usr/src/share/mk RTE_SDK=${CURDIR}/usr/click/lib/libintel_dpdk -RTE_KERNELDIR=/lib/modules/3.10.0-327.28.2.17.el7.x86_64/build +RTE_KERNELDIR=/lib/modules/3.10.0-327.28.2.21.el7.x86_64/build LIBPCAP_DIR=${CLICK_LIB}/libpcap RTE_TARGET=x86_64-default-linuxapp-gcc REL=$(shell /usr/bin/awk '{print $$1}' usr/click/lib/libversion/tag) @@ -420,4 +420,4 @@ echo -e 'Image-order: ${REL}.${IMAGE_TYPE}' >> metadata.ini echo -e "Console-type: VNC" >> metadata.ini echo -e "Image-md5value: $(shell /usr/bin/md5sum ${REL}.${IMAGE_TYPE} | /usr/bin/awk '{print $$1}') " >> metadata.ini - tar czvf ${REL}.${IMAGE_TYPE}.tar.gz ${REL}.${IMAGE_TYPE} metadata.ini \ No newline at end of file + tar czvf ${REL}.${IMAGE_TYPE}.tar.gz ${REL}.${IMAGE_TYPE} metadata.ini Index: /branches/rel_apv_10_7/tools/image_creator.sh =================================================================== --- /branches/rel_apv_10_7/tools/image_creator.sh (revision 38122) +++ /branches/rel_apv_10_7/tools/image_creator.sh (working copy) @@ -26,6 +26,10 @@ DEFAULT_LICENSE=$5 MACHINE_ARCH=`uname -m` +if [ "x$IMAGE_TARGET" = "xaws" ]; then +KERNEL_VERSION=3.10.0-327.28.2.21.el7.x86_64 +fi + # create base image create_base_image() { if [ ! -f $BASEIMAGE_DIR/$BASEIMAGE_NAME.$IMAGE_TYPE ] @@ -162,7 +166,11 @@ /bin/cp -rfpd ./img/* /mnt/ /bin/cp -f /mnt/ca/ssl/bin/root-cas.crt /mnt/ca/ssl/vhost/ /bin/cp -f /mnt/ca/etc/loader.conf ./files/ - /bin/cp -f /mnt/ca/etc/grub.cfg.vAPV ./files/grub.cfg + if [ "x$IMAGE_TARGET" = "xaws" ]; then + /bin/cp -f /mnt/ca/etc/grub.cfg.AWS ./files/grub.cfg + else + /bin/cp -f /mnt/ca/etc/grub.cfg.vAPV ./files/grub.cfg + fi if [ "x$IMAGE_TARGET" = "xhuawei" ]; then echo cloud_platform=${IMAGE_TARGET} >> ./files/loader.conf echo dhcp_enabled_all=yes >> ./files/loader.conf @@ -194,14 +202,24 @@ echo 'LABEL=caupgrade /caupgrade xfs defaults 0 0' >> /mnt/etc/fstab echo 'LABEL=swap swap swap defaults 0 0' >> /mnt/etc/fstab echo 'LABEL=var /var xfs defaults 0 0' >> /mnt/etc/fstab - echo "SELINUX=disabled" > /mnt/etc/selinux/config - echo "SELINUXTYPE=targeted" >> /mnt/etc/selinux/config - echo "AN" > /mnt/etc/hostname - sed -i '/^array/d' /mnt/etc/shadow if [ "x$IMAGE_TARGET" = "xaws" ]; then - sed -i 's/.*PasswordAuthentication yes/PasswordAuthentication no/g' /mnt/etc/ssh/sshd_config + echo 'LABEL=caupgrade / xfs defaults 0 0' > /mnt/etc/fstab.slave + echo 'LABEL=boot /boot ext4 defaults 1 2' >> /mnt/etc/fstab.slave + echo 'LABEL=root /caupgrade xfs defaults 0 0' >> /mnt/etc/fstab.slave + echo 'LABEL=swap swap swap defaults 0 0' >> /mnt/etc/fstab.slave + echo 'LABEL=var /var xfs defaults 0 0' >> /mnt/etc/fstab.slave + /bin/cp -f /mnt/vmlinuz ./files/vmlinuz-${KERNEL_VERSION} + /bin/cp -f /mnt/initramfs-array.img ./files/initramfs-${KERNEL_VERSION}.img + /bin/cp -f /mnt/vmlinuz /mnt/vmlinuz-${KERNEL_VERSION} + /bin/cp -f /mnt/initramfs-array.img /mnt/initramfs-${KERNEL_VERSION}.img + /bin/cp -f /mnt/etc/shadow /mnt/etc/shadow.aws_backup + sed -i '/^ansync/d' /mnt/etc/shadow sed -i 's/.*PasswordAuthentication yes/PasswordAuthentication no/g' /mnt/ca/etc/sshd_config + sed -i 's/.*PasswordAuthentication yes/PasswordAuthentication no/g' /mnt/etc/ssh/sshd_config fi + echo "SELINUX=disabled" > /mnt/etc/selinux/config + echo "SELINUXTYPE=targeted" >> /mnt/etc/selinux/config + echo "AN" > /mnt/etc/hostname /bin/rm -f /mnt/etc/systemd/system/multi-user.target.wants/sshd.service /bin/rm -f /mnt/etc/systemd/system/multi-user.target.wants/NetworkManager.service /bin/rm -f /mnt/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service @@ -221,33 +239,37 @@ echo 'hugepages=512' >> /mnt/grub2/grubenv echo 'avx_hgpgsz=2M' >> /mnt/grub2/grubenv echo 'avx_hgpgs=54272' >> /mnt/grub2/grubenv - guestunmount /mnt - sleep 10 - #ROOTEEE - echo "copy files into the ROOTEEE partition" - guestmount -a ${BASEIMAGE_DIR}/ustack.${IMAGE_TYPE} -m /dev/sda3 /mnt - /bin/cp -rfpd ./img/* /mnt/ - /bin/cp -f /mnt/ca/ssl/bin/root-cas.crt /mnt/ca/ssl/vhost/ - echo 'LABEL=caupgrade / xfs defaults 0 0' > /mnt/etc/fstab - echo 'LABEL=boot /boot ext4 defaults 1 2' >> /mnt/etc/fstab - echo 'LABEL=root /caupgrade xfs defaults 0 0' >> /mnt/etc/fstab - echo 'LABEL=swap swap swap defaults 0 0' >> /mnt/etc/fstab - echo 'LABEL=var /var xfs defaults 0 0' >> /mnt/etc/fstab - echo "SELINUX=disabled" > /mnt/etc/selinux/config - echo "SELINUXTYPE=targeted" >> /mnt/etc/selinux/config - echo "AN" > /mnt/etc/hostname - #delete the password of array on the image - sed -i '/^array/d' /mnt/etc/shadow if [ "x$IMAGE_TARGET" = "xaws" ]; then - sed -i 's/.*PasswordAuthentication yes/PasswordAuthentication no/g' /mnt/etc/ssh/sshd_config - sed -i 's/.*PasswordAuthentication yes/PasswordAuthentication no/g' /mnt/ca/etc/sshd_config + /bin/cp -f ./tools/config-${KERNEL_VERSION} /mnt/grub2/ + /bin/cp -f ./tools/config-${KERNEL_VERSION} /mnt/ + /bin/cp -f ./files/vmlinuz-${KERNEL_VERSION} /mnt + /bin/cp -f ./files/initramfs-${KERNEL_VERSION}.img /mnt fi - /bin/rm -f /mnt/etc/systemd/system/multi-user.target.wants/sshd.service - /bin/rm -f /mnt/etc/systemd/system/multi-user.target.wants/NetworkManager.service - /bin/rm -f /mnt/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service - /bin/rm -f /mnt/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service guestunmount /mnt sleep 10 + #ROOTEEE + if [ "x$IMAGE_TARGET" != "xaws" ]; then + echo "copy files into the ROOTEEE partition" + guestmount -a ${BASEIMAGE_DIR}/ustack.${IMAGE_TYPE} -m /dev/sda3 /mnt + /bin/cp -rfpd ./img/* /mnt/ + /bin/cp -f /mnt/ca/ssl/bin/root-cas.crt /mnt/ca/ssl/vhost/ + echo 'LABEL=caupgrade / xfs defaults 0 0' > /mnt/etc/fstab + echo 'LABEL=boot /boot ext4 defaults 1 2' >> /mnt/etc/fstab + echo 'LABEL=root /caupgrade xfs defaults 0 0' >> /mnt/etc/fstab + echo 'LABEL=swap swap swap defaults 0 0' >> /mnt/etc/fstab + echo 'LABEL=var /var xfs defaults 0 0' >> /mnt/etc/fstab + echo "SELINUX=disabled" > /mnt/etc/selinux/config + echo "SELINUXTYPE=targeted" >> /mnt/etc/selinux/config + echo "AN" > /mnt/etc/hostname + #delete the password of array on the image + #sed -i '/^array/d' /mnt/etc/shadow + /bin/rm -f /mnt/etc/systemd/system/multi-user.target.wants/sshd.service + /bin/rm -f /mnt/etc/systemd/system/multi-user.target.wants/NetworkManager.service + /bin/rm -f /mnt/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service + /bin/rm -f /mnt/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service + guestunmount /mnt + sleep 10 + fi echo "repair the partiations" guestfish --rw -a ${BASEIMAGE_DIR}/ustack.${IMAGE_TYPE} run : xfs_repair /dev/sda2 guestfish --rw -a ${BASEIMAGE_DIR}/ustack.${IMAGE_TYPE} run : xfs_repair /dev/sda3 Index: /branches/rel_apv_10_7/tools/update_for_vendor.sh =================================================================== --- /branches/rel_apv_10_7/tools/update_for_vendor.sh (revision 38122) +++ /branches/rel_apv_10_7/tools/update_for_vendor.sh (working copy) @@ -15,6 +15,6 @@ echo "intel" pushd usr/click/lib/mlnx/ > /dev/null tar zxf MLNX_OFED_LINUX-4.0-1.0.1.0-rhel7.2-ext.tgz - ./MLNX_OFED_LINUX-4.0-1.0.1.0-rhel7.2-ext/mlnxofedinstall --kernel 3.10.0-327.28.2.17.el7.x86_64 --kernel-sources /lib/modules/3.10.0-327.28.2.17.el7.x86_64/build --skip-kmp-verify --force + ./MLNX_OFED_LINUX-4.0-1.0.1.0-rhel7.2-ext/mlnxofedinstall --kernel 3.10.0-327.28.2.21.el7.x86_64 --kernel-sources /lib/modules/3.10.0-327.28.2.21.el7.x86_64/build --skip-kmp-verify --force popd > /dev/null fi Index: /branches/rel_apv_10_7/tools/ustack.spec =================================================================== --- /branches/rel_apv_10_7/tools/ustack.spec (revision 38122) +++ /branches/rel_apv_10_7/tools/ustack.spec (working copy) @@ -274,7 +274,6 @@ install -Dm 0755 -t %{buildroot}/ca/lib \ %{ustack_rootdir}/usr/click/lib/libopenldap/openldap-2.4.30/libraries/liblber/.libs/liblber-2.4.so.2.8.3 - %files %defattr(-,root,root) %attr (755,root,root)/ca/bin/* Index: /branches/rel_apv_10_7/tools/ustackbuildenv.ks =================================================================== --- /branches/rel_apv_10_7/tools/ustackbuildenv.ks (revision 38122) +++ /branches/rel_apv_10_7/tools/ustackbuildenv.ks (working copy) @@ -26,8 +26,8 @@ bash-4.2.46-19.el7.x86_64 sparsehash-devel-2.0.2-4.el7.x86_64 -kernel-3.10.0-327.28.2.17.el7.x86_64 -kernel-devel-3.10.0-327.28.2.17.el7.x86_64 +kernel-3.10.0-327.28.2.21.el7.x86_64 +kernel-devel-3.10.0-327.28.2.21.el7.x86_64 syslinux-4.05-12.el7.x86_64 passwd-0.79-4.el7.x86_64 policycoreutils-2.2.5-20.el7.x86_64 @@ -381,7 +381,7 @@ python-pycurl-7.19.0-17.el7.x86_64 fipscheck-lib-1.4.1-5.el7.x86_64 krb5-devel-1.13.2-10.el7.x86_64 -kernel-headers-3.10.0-327.28.2.17.el7.x86_64 +kernel-headers-3.10.0-327.28.2.21.el7.x86_64 libicu-50.1.2-15.el7.x86_64 fontpackages-filesystem-1.44-8.el7.noarch msgpack-0.5.8-1.el7.x86_64 Index: /branches/rel_apv_10_7/tools/ustackbuildutils.py =================================================================== --- /branches/rel_apv_10_7/tools/ustackbuildutils.py (revision 38122) +++ /branches/rel_apv_10_7/tools/ustackbuildutils.py (working copy) @@ -352,7 +352,7 @@ if self.sys_os != 'uos' and self.arch != 'aarch64' and self.platform == FLATFORM_INTEL: mlnx_cmd = ['tar', 'xzf', './usr/click/lib/mlnx/MLNX_OFED_LINUX-4.0-1.0.1.0-rhel7.2-ext.tgz', '-C' './pack/install_root/tmp'] log_exec(mlnx_cmd) - mlnx_cmd = ['chroot', 'pack/install_root', 'su', '-', 'root', '-c', 'cd /tmp/MLNX_OFED_LINUX-4.0-1.0.1.0-rhel7.2-ext && ./mlnxofedinstall --kernel 3.10.0-327.28.2.17.el7.x86_64 --kernel-sources /lib/modules/3.10.0-327.28.2.17.el7.x86_64/build --force'] + mlnx_cmd = ['chroot', 'pack/install_root', 'su', '-', 'root', '-c', 'cd /tmp/MLNX_OFED_LINUX-4.0-1.0.1.0-rhel7.2-ext && ./mlnxofedinstall --kernel 3.10.0-327.28.2.21.el7.x86_64 --kernel-sources /lib/modules/3.10.0-327.28.2.21.el7.x86_64/build --force'] log_exec(mlnx_cmd) mlnx_cmd = ['rm', '-rf', './pack/install_root/tmp/MLNX_OFED_LINUX-4.0-1.0.1.0-rhel7.2-ext'] log_exec(mlnx_cmd) Index: /branches/rel_apv_10_7/tools/ustackbuildutils.py3 =================================================================== --- /branches/rel_apv_10_7/tools/ustackbuildutils.py3 (revision 38122) +++ /branches/rel_apv_10_7/tools/ustackbuildutils.py3 (working copy) @@ -341,7 +341,7 @@ if self.sys_os != 'uos' and self.arch != 'aarch64': mlnx_cmd = ['tar', 'xzf', './usr/click/lib/mlnx/MLNX_OFED_LINUX-4.0-1.0.1.0-rhel7.2-ext.tgz', '-C' './pack/install_root/tmp'] log_exec(mlnx_cmd) - mlnx_cmd = ['chroot', 'pack/install_root', 'su', '-', 'root', '-c', 'cd /tmp/MLNX_OFED_LINUX-4.0-1.0.1.0-rhel7.2-ext && ./mlnxofedinstall --kernel 3.10.0-327.28.2.17.el7.x86_64 --kernel-sources /lib/modules/3.10.0-327.28.2.17.el7.x86_64/build --force'] + mlnx_cmd = ['chroot', 'pack/install_root', 'su', '-', 'root', '-c', 'cd /tmp/MLNX_OFED_LINUX-4.0-1.0.1.0-rhel7.2-ext && ./mlnxofedinstall --kernel 3.10.0-327.28.2.21.el7.x86_64 --kernel-sources /lib/modules/3.10.0-327.28.2.21.el7.x86_64/build --force'] log_exec(mlnx_cmd) mlnx_cmd = ['rm', '-rf', './pack/install_root/tmp/MLNX_OFED_LINUX-4.0-1.0.1.0-rhel7.2-ext'] log_exec(mlnx_cmd)