X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-stx%2Frecipes-core%2Fstx-metal%2Fpxe-network-installer.inc;h=8658e2cdcb77705b0dbc90acbc930e737644906b;hb=047c0e2a5dac218708f4e694deaa45f9861c9d1e;hp=524c0d67cd530844fdc9bfd2b3d4a3d8e91a3a84;hpb=57fdea704bd62af847872c40508f00aa1d7cac60;p=pti%2Frtp.git

diff --git a/meta-stx/recipes-core/stx-metal/pxe-network-installer.inc b/meta-stx/recipes-core/stx-metal/pxe-network-installer.inc
index 524c0d6..8658e2c 100644
--- a/meta-stx/recipes-core/stx-metal/pxe-network-installer.inc
+++ b/meta-stx/recipes-core/stx-metal/pxe-network-installer.inc
@@ -17,9 +17,12 @@ PACKAGES += " pxe-network-installer"
 
 DEPENDS += " syslinux"
 RDEPENDS_pxe-network-installer += " \
-		syslinux \
-		bash \
-		"
+	bash \
+	syslinux \
+	syslinux-chain \
+	syslinux-misc \
+	syslinux-pxelinux \
+	"
 
 do_configure_prepend () {
 	:
@@ -34,23 +37,14 @@ do_install_prepend () {
 	install -d -m 0755 ${D}/pxeboot
 	install -d -m 0755 ${D}/pxeboot/pxelinux.cfg.files
 	install -d -m 0755 ${D}/pxeboot/rel-${STX_REL}
-	install -d -m 0755 ${D}/pxeboot/rel-${STX_REL}/LiveOS/
 	install -d -m 0755 ${D}/pxeboot/EFI
-	install -d -m 0755 ${D}/pxeboot/EFI/stx_thud
-	install -d -m 0755 ${D}/${sbindir}
-	ln -fs /pxeboot/stx_thud ${D}/pxeboot/centos
-	ln -fs ${libdir}/grub/x86_64-efi ${D}/pxeboot/EFI/stx_thud/
-
-	# Install the files:
-	if [ ! -z "${INSTALLER_IMG_DIR}" ]; then
-		install -m 0644 ${INSTALLER_IMG_DIR}/vmlinuz ${D}/pxeboot/stx_thud/rel-${STX_REL}/installer-bzImage_1.0
-		install -m 0644 ${INSTALLER_IMG_DIR}/initrd.img ${D}/pxeboot/stx_thud/rel-${STX_REL}/installer-intel-x86-64-initrd_1.0
-		install -m 0644 ${INSTALLER_IMG_DIR}/squashfs.img ${D}/pxeboot/stx_thud/rel-${STX_REL}/LiveOS/squashfs.img
-		ln -fs installer-bzImage_1.0 ${D}/pxeboot/rel-${STX_REL}/installer-bzImage
-		ln -fs installer-intel-x86-64-initrd_1.0 ${D}/pxeboot/rel-${STX_REL}/installer-initrd
-	fi
+	install -d -m 0755 ${D}/pxeboot/EFI/poky-stx
+	ln -fs poky-stx ${D}/pxeboot/EFI/centos
+	ln -fs ${libdir}/grub/x86_64-efi ${D}/pxeboot/EFI/poky-stx/
 
+	install -d -m 0755 ${D}/${sbindir}
 	install -m 755 pxeboot-update.sh ${D}/${sbindir}/pxeboot-update-${STX_REL}.sh
+
 	install -m 644 ${S}/bsp-files/kickstarts/post_clone_iso_ks.cfg ${D}/pxeboot/post_clone_iso_ks.cfg
 	install -m 644 default ${D}/pxeboot/pxelinux.cfg.files/default
 	install -m 644 default.static ${D}/pxeboot/pxelinux.cfg.files/default.static
@@ -65,10 +59,6 @@ do_install_prepend () {
 	install -m 644 pxe-grub.cfg ${D}/pxeboot/pxelinux.cfg.files/grub.cfg
 	install -m 644 pxe-grub.cfg.static ${D}/pxeboot/pxelinux.cfg.files/grub.cfg.static
 
-	# Copy EFI boot image. It will be used to create ISO on the Controller.
-	if [ ! -z "${INSTALLER_IMG_DIR}" ]; then
-		install -m 644 efiboot.img ${D}/pxeboot/rel-${STX_REL}/
-	fi
 	install -m 644 efi-centos-pxe-controller-install ${D}/pxeboot/pxelinux.cfg.files/efi-pxe-controller-install-${STX_REL}
 	install -m 644 efi-centos-pxe-worker-install ${D}/pxeboot/pxelinux.cfg.files/efi-pxe-worker-install-${STX_REL}
 	install -m 644 efi-centos-pxe-smallsystem-install ${D}/pxeboot/pxelinux.cfg.files/efi-pxe-smallsystem-install-${STX_REL}
@@ -76,29 +66,31 @@ do_install_prepend () {
 	install -m 644 efi-centos-pxe-worker_lowlatency-install ${D}/pxeboot/pxelinux.cfg.files/efi-pxe-worker_lowlatency-install-${STX_REL}
 	install -m 644 efi-centos-pxe-smallsystem_lowlatency-install ${D}/pxeboot/pxelinux.cfg.files/efi-pxe-smallsystem_lowlatency-install-${STX_REL}
 
-	sed -i "s/xxxSW_VERSIONxxx/${STX_REL}/g" ${D}/pxeboot/pxelinux.cfg.files/pxe-* ${D}/pxeboot/pxelinux.cfg.files/efi-pxe-* 
+	sed -i -e "s/xxxSW_VERSIONxxx/${STX_REL}/g" \
+	       -e "s/inst.ks/ks/g" \
+	       -e "s/\(xxxAPPEND_OPTIONSxxx\)/LABEL=initrd-install \1/" \
+	       ${D}/pxeboot/pxelinux.cfg.files/pxe-* ${D}/pxeboot/pxelinux.cfg.files/efi-pxe-*
 	
 	# Copy Titanium grub.cfg. It will be used to create ISO on the Controller.
 	install -m 0644 ${S}/bsp-files/grub.cfg ${D}/pxeboot/EFI/ 
+
 	# UEFI bootloader expect the grub.cfg file to be in /pxeboot/ so create a symlink for it
 	ln -fs pxelinux.cfg/grub.cfg ${D}/pxeboot/grub.cfg
 }
 
-pkg_postinst_ontarget_pxe-network_installer() {
-	install -m 0644 /usr/share/syslinux/menu.c32 /pxeboot
-	install -m 0644 /usr/share/syslinux/vesamenu.c32 /pxeboot
-	install -m 0644 /usr/share/syslinux/chain.c32 /pxeboot
-	install -m 0644 /usr/share/syslinux/linux.c32 /pxeboot
-	install -m 0644 /usr/share/syslinux/reboot.c32 /pxeboot
-	install -m 0644 /usr/share/syslinux/pxechn.c32 /pxeboot
-	install -m 0644 /usr/share/syslinux/pxelinux.0 /pxeboot
-	install -m 0644 /usr/share/syslinux/gpxelinux.0 /pxeboot
+pkg_postinst_pxe-network-installer() {
+	install -m 0644 $D${datadir}/syslinux/menu.c32 $D/pxeboot
+	install -m 0644 $D${datadir}/syslinux/vesamenu.c32 $D/pxeboot
+	install -m 0644 $D${datadir}/syslinux/chain.c32 $D/pxeboot
+	install -m 0644 $D${datadir}/syslinux/ldlinux.c32 $D/pxeboot
+	install -m 0644 $D${datadir}/syslinux/linux.c32 $D/pxeboot
+	install -m 0644 $D${datadir}/syslinux/libutil.c32 $D/pxeboot
+	install -m 0644 $D${datadir}/syslinux/reboot.c32 $D/pxeboot
+	install -m 0644 $D${datadir}/syslinux/pxechn.c32 $D/pxeboot
+	install -m 0644 $D${datadir}/syslinux/pxelinux.0 $D/pxeboot
 }
 
 FILES_pxe-network-installer = " \
 	/pxeboot \
 	${sbindir}/pxeboot-update-${STX_REL}.sh \
 	"
-	
-
-