[RFC,configs/releng] Remove i686 syslinux files

Message ID 20170212222140.19982-1-vmlinuz386@gmail.com
State New
Headers show

Commit Message

Ian Li via arch-releng Feb. 12, 2017, 10:21 p.m. UTC
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@gmail.com>
---
 configs/releng/syslinux/archiso.cfg                |  4 +--
 .../{archiso_pxe64.cfg => archiso_pxe.cfg}         |  4 +++
 configs/releng/syslinux/archiso_pxe32.cfg          | 32 ----------------------
 configs/releng/syslinux/archiso_pxe_32_inc.cfg     |  3 --
 configs/releng/syslinux/archiso_pxe_both_inc.cfg   |  4 ---
 configs/releng/syslinux/archiso_pxe_choose.cfg     | 11 --------
 .../{archiso_sys64.cfg => archiso_sys.cfg}         |  4 +++
 configs/releng/syslinux/archiso_sys32.cfg          |  9 ------
 configs/releng/syslinux/archiso_sys_32_inc.cfg     |  3 --
 configs/releng/syslinux/archiso_sys_both_inc.cfg   |  4 ---
 configs/releng/syslinux/archiso_sys_choose.cfg     | 11 --------
 11 files changed, 10 insertions(+), 79 deletions(-)
 rename configs/releng/syslinux/{archiso_pxe64.cfg => archiso_pxe.cfg} (93%)
 delete mode 100644 configs/releng/syslinux/archiso_pxe32.cfg
 delete mode 100644 configs/releng/syslinux/archiso_pxe_32_inc.cfg
 delete mode 100644 configs/releng/syslinux/archiso_pxe_both_inc.cfg
 delete mode 100644 configs/releng/syslinux/archiso_pxe_choose.cfg
 rename configs/releng/syslinux/{archiso_sys64.cfg => archiso_sys.cfg} (79%)
 delete mode 100644 configs/releng/syslinux/archiso_sys32.cfg
 delete mode 100644 configs/releng/syslinux/archiso_sys_32_inc.cfg
 delete mode 100644 configs/releng/syslinux/archiso_sys_both_inc.cfg
 delete mode 100644 configs/releng/syslinux/archiso_sys_choose.cfg

Patch

diff --git a/configs/releng/syslinux/archiso.cfg b/configs/releng/syslinux/archiso.cfg
index d1817af..40d8b34 100644
--- a/configs/releng/syslinux/archiso.cfg
+++ b/configs/releng/syslinux/archiso.cfg
@@ -5,7 +5,7 @@  COM32 boot/syslinux/whichsys.c32
 APPEND -pxe- pxe -sys- sys -iso- sys
 
 LABEL pxe
-CONFIG boot/syslinux/archiso_pxe_choose.cfg
+CONFIG boot/syslinux/archiso_pxe.cfg
 
 LABEL sys
-CONFIG boot/syslinux/archiso_sys_choose.cfg
+CONFIG boot/syslinux/archiso_sys.cfg
diff --git a/configs/releng/syslinux/archiso_pxe64.cfg b/configs/releng/syslinux/archiso_pxe.cfg
similarity index 93%
rename from configs/releng/syslinux/archiso_pxe64.cfg
rename to configs/releng/syslinux/archiso_pxe.cfg
index 2598916..481371a 100644
--- a/configs/releng/syslinux/archiso_pxe64.cfg
+++ b/configs/releng/syslinux/archiso_pxe.cfg
@@ -1,3 +1,5 @@ 
+INCLUDE boot/syslinux/archiso_head.cfg
+
 LABEL arch64_nbd
 TEXT HELP
 Boot the Arch Linux (x86_64) live medium (Using NBD).
@@ -30,3 +32,5 @@  LINUX boot/x86_64/vmlinuz
 INITRD boot/intel_ucode.img,boot/x86_64/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/
 SYSAPPEND 3
+
+INCLUDE boot/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux/archiso_pxe32.cfg b/configs/releng/syslinux/archiso_pxe32.cfg
deleted file mode 100644
index aaa793e..0000000
--- a/configs/releng/syslinux/archiso_pxe32.cfg
+++ /dev/null
@@ -1,32 +0,0 @@ 
-LABEL arch32_nbd
-TEXT HELP
-Boot the Arch Linux (i686) live medium (Using NBD).
-It allows you to install Arch Linux or perform system maintenance.
-ENDTEXT
-MENU LABEL Boot Arch Linux (i686) (NBD)
-LINUX boot/i686/vmlinuz
-INITRD boot/intel_ucode.img,boot/i686/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver}
-SYSAPPEND 3
-
-LABEL arch32_nfs
-TEXT HELP
-Boot the Arch Linux (i686) live medium (Using NFS).
-It allows you to install Arch Linux or perform system maintenance.
-ENDTEXT
-MENU LABEL Boot Arch Linux (i686) (NFS)
-LINUX boot/i686/vmlinuz
-INITRD boot/intel_ucode.img,boot/i686/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt
-SYSAPPEND 3
-
-LABEL arch32_http
-TEXT HELP
-Boot the Arch Linux (i686) live medium (Using HTTP).
-It allows you to install Arch Linux or perform system maintenance.
-ENDTEXT
-MENU LABEL Boot Arch Linux (i686) (HTTP)
-LINUX boot/i686/vmlinuz
-INITRD boot/intel_ucode.img,boot/i686/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/
-SYSAPPEND 3
diff --git a/configs/releng/syslinux/archiso_pxe_32_inc.cfg b/configs/releng/syslinux/archiso_pxe_32_inc.cfg
deleted file mode 100644
index e4115df..0000000
--- a/configs/releng/syslinux/archiso_pxe_32_inc.cfg
+++ /dev/null
@@ -1,3 +0,0 @@ 
-INCLUDE boot/syslinux/archiso_head.cfg
-INCLUDE boot/syslinux/archiso_pxe32.cfg
-INCLUDE boot/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux/archiso_pxe_both_inc.cfg b/configs/releng/syslinux/archiso_pxe_both_inc.cfg
deleted file mode 100644
index 1593303..0000000
--- a/configs/releng/syslinux/archiso_pxe_both_inc.cfg
+++ /dev/null
@@ -1,4 +0,0 @@ 
-INCLUDE boot/syslinux/archiso_head.cfg
-INCLUDE boot/syslinux/archiso_pxe64.cfg
-INCLUDE boot/syslinux/archiso_pxe32.cfg
-INCLUDE boot/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux/archiso_pxe_choose.cfg b/configs/releng/syslinux/archiso_pxe_choose.cfg
deleted file mode 100644
index 6296065..0000000
--- a/configs/releng/syslinux/archiso_pxe_choose.cfg
+++ /dev/null
@@ -1,11 +0,0 @@ 
-DEFAULT choose
-
-LABEL choose
-COM32 boot/syslinux/ifcpu64.c32
-APPEND have64 -- nohave64
-
-LABEL have64
-CONFIG boot/syslinux/archiso_pxe_both_inc.cfg
-
-LABEL nohave64
-CONFIG boot/syslinux/archiso_pxe_32_inc.cfg
diff --git a/configs/releng/syslinux/archiso_sys64.cfg b/configs/releng/syslinux/archiso_sys.cfg
similarity index 79%
rename from configs/releng/syslinux/archiso_sys64.cfg
rename to configs/releng/syslinux/archiso_sys.cfg
index 2694968..0c82573 100644
--- a/configs/releng/syslinux/archiso_sys64.cfg
+++ b/configs/releng/syslinux/archiso_sys.cfg
@@ -1,3 +1,5 @@ 
+INCLUDE boot/syslinux/archiso_head.cfg
+
 LABEL arch64
 TEXT HELP
 Boot the Arch Linux (x86_64) live medium.
@@ -7,3 +9,5 @@  MENU LABEL Boot Arch Linux (x86_64)
 LINUX boot/x86_64/vmlinuz
 INITRD boot/intel_ucode.img,boot/x86_64/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
+
+INCLUDE boot/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux/archiso_sys32.cfg b/configs/releng/syslinux/archiso_sys32.cfg
deleted file mode 100644
index 9d4d24b..0000000
--- a/configs/releng/syslinux/archiso_sys32.cfg
+++ /dev/null
@@ -1,9 +0,0 @@ 
-LABEL arch32
-TEXT HELP
-Boot the Arch Linux (i686) live medium.
-It allows you to install Arch Linux or perform system maintenance.
-ENDTEXT
-MENU LABEL Boot Arch Linux (i686)
-LINUX boot/i686/vmlinuz
-INITRD boot/intel_ucode.img,boot/i686/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
diff --git a/configs/releng/syslinux/archiso_sys_32_inc.cfg b/configs/releng/syslinux/archiso_sys_32_inc.cfg
deleted file mode 100644
index 9e37093..0000000
--- a/configs/releng/syslinux/archiso_sys_32_inc.cfg
+++ /dev/null
@@ -1,3 +0,0 @@ 
-INCLUDE boot/syslinux/archiso_head.cfg
-INCLUDE boot/syslinux/archiso_sys32.cfg
-INCLUDE boot/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux/archiso_sys_both_inc.cfg b/configs/releng/syslinux/archiso_sys_both_inc.cfg
deleted file mode 100644
index e885c40..0000000
--- a/configs/releng/syslinux/archiso_sys_both_inc.cfg
+++ /dev/null
@@ -1,4 +0,0 @@ 
-INCLUDE boot/syslinux/archiso_head.cfg
-INCLUDE boot/syslinux/archiso_sys64.cfg
-INCLUDE boot/syslinux/archiso_sys32.cfg
-INCLUDE boot/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux/archiso_sys_choose.cfg b/configs/releng/syslinux/archiso_sys_choose.cfg
deleted file mode 100644
index 24c597a..0000000
--- a/configs/releng/syslinux/archiso_sys_choose.cfg
+++ /dev/null
@@ -1,11 +0,0 @@ 
-DEFAULT choose
-
-LABEL choose
-COM32 boot/syslinux/ifcpu64.c32
-APPEND have64 -- nohave64
-
-LABEL have64
-CONFIG boot/syslinux/archiso_sys_both_inc.cfg
-
-LABEL nohave64
-CONFIG boot/syslinux/archiso_sys_32_inc.cfg