From patchwork Sun Feb 12 22:21:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nl6720 via arch-releng X-Patchwork-Id: 7 Return-Path: Delivered-To: patchwork@archlinux.org Received: from nymeria.archlinux.org by nymeria.archlinux.org (Dovecot) with LMTP id 4dQHA/3foFjoDQAAtiB/HQ for ; Sun, 12 Feb 2017 23:21:49 +0100 Received: from nymeria.archlinux.org (localhost.localdomain [127.0.0.1]) by nymeria.archlinux.org (Postfix) with ESMTP id D840D40245; Sun, 12 Feb 2017 23:21:47 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on nymeria.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-4.3 required=2.5 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED shortcircuit=no autolearn=unavailable autolearn_force=no version=3.4.1 Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by nymeria.archlinux.org (Postfix) with ESMTPS; Sun, 12 Feb 2017 23:21:47 +0100 (CET) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 97FF12CCC8; Sun, 12 Feb 2017 22:21:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1486938107; bh=fqGoRRP29ME+gS8jhzNWE3+sw26VgQX9ArtJkxImjV8=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc; b=JXNFXdOTE2zf38Vaw6Tp0xhXmbUKystE2IEn5tYwkKvNxrANYmuzN8f3CmtbJGIuV nr7bzENlkRpaq3ZfD9prTxiRclo4KMYU2KFbfxO/yi3g8CmHQ+EjRXn9A4qelVczYI Q1ZETA54wPGtkGdeD54InLvqHjs7Embr8ovgxZinNwUAaXw8lG/S6mh35nwzxxxnTm gM+GgULqBmzt8foXpE3Wv+Y2Ga92ep3jbEkaYSfnO+FlCSDidkm0mxEGFsdjrzu5Zh HF+McWZRfMevqgTWeLukLsCU3PF3RQmm/Rt1G3tfjMJ4+nTiByVBM4gfPXTS0imU66 aKCOcsm8VSEEEpr0g8yOJPIyRCopo67fes4NGybHRPH+s1M2ATmy1ByGH1Jq47FCrO HKH9PK5bcfmOJ/JOz2sXO9VDCKVbPkXS6QWu1uJGlVdHPkKR4nabyp8U1o+tsku+ny QD2wm1mF7csGXWriqWJ6Jg+/WGdnnl5mDjgS17Aw1JOnYwc/0CWjr9f2Rk8utgyWPb lJ4BBmKDCfgSbLSaS8cx+bOBob0BghOP4R7ZrQr32bzDh9M0B5+LGnWnFNHIYE870i mvHsA6xN4anEkyBCDAGFbud4lhLpZjxzWetHGPvoCCrY95a9FqX/H+VRtH+iwCiCaH MMA99x6VGNS45gy07kcj30Ig= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 5E1842CCC7 for ; Sun, 12 Feb 2017 22:21:46 +0000 (UTC) Received: from nymeria.archlinux.org (nymeria.archlinux.org [89.238.67.251]) by luna.archlinux.org (Postfix) with ESMTPS for ; Sun, 12 Feb 2017 22:21:46 +0000 (UTC) Received: from nymeria.archlinux.org (localhost.localdomain [127.0.0.1]) by nymeria.archlinux.org (Postfix) with ESMTP id B4F3C40245 for ; Sun, 12 Feb 2017 23:21:44 +0100 (CET) Received: from mail-qt0-x242.google.com (mail-qt0-x242.google.com [IPv6:2607:f8b0:400d:c0d::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by nymeria.archlinux.org (Postfix) with ESMTPS for ; Sun, 12 Feb 2017 23:21:44 +0100 (CET) Received: by mail-qt0-x242.google.com with SMTP id h53so10969526qth.3 for ; Sun, 12 Feb 2017 14:21:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=jF97NCaAFa3hU+7ESWMuW8BEDXLMJv5LObLSHDPWsSQ=; b=PwUI+fYN/2I1FL8RU5ygWmmZW6/RIEhdL36IQ2Lp8E21pDRe1etqeCk1IptfM+DSFx /MxGYzKxngS5ZUqxUvsswAzAyOGxmkYgp0KWO2ekgkjv5C6rnFKh9Mp17MpLCIwhq7bA Myo0Ay8v6n2Igbd01nnLWPeHQJBnmOvUGZx0ZOzqu3vSWX1gXxIa0FraLeFuiZayDFHX X4ps50pEsY/UXhnee/XWyeQ64WmbR8VxrfIHMJdxdlPy4Ajq+SmRO4so4e+b/UTgpMUO aoqN4kWNr4q5Ehum/vzL4E0QcLDK7Ps5oVtUxziGVgdk1DSO2qF4927KX8FqeL1kaq4k eqDw== X-Gm-Message-State: AMke39mtxGO1NYXP2ZOlxCNp+Tn1x8nUl3ZvP06uIsurT4aMtQbrDLLwpV5yc0NxNp46Dg== X-Received: by 10.200.47.208 with SMTP id m16mr17530383qta.64.1486938103418; Sun, 12 Feb 2017 14:21:43 -0800 (PST) Received: from localhost ([181.90.192.191]) by smtp.gmail.com with ESMTPSA id g128sm2862105qke.4.2017.02.12.14.21.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 12 Feb 2017 14:21:42 -0800 (PST) To: arch-releng@archlinux.org Date: Sun, 12 Feb 2017 19:21:40 -0300 Message-Id: <20170212222140.19982-1-vmlinuz386@gmail.com> X-Mailer: git-send-email 2.11.1 Subject: [arch-releng] [RFC] [PATCH] [configs/releng] Remove i686 syslinux files X-BeenThere: arch-releng@archlinux.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Arch Linux Release Engineering List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Gerardo Exequiel Pozzi via arch-releng Reply-To: Arch Linux Release Engineering Cc: Gerardo Exequiel Pozzi Errors-To: arch-releng-bounces@archlinux.org Sender: "arch-releng" X-UID: 28 Status: X-Keywords: Content-Length: 7780 Signed-off-by: Gerardo Exequiel Pozzi --- 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 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