{"id":808288,"url":"http://patchwork.ozlabs.org/api/1.2/patches/808288/?format=json","web_url":"http://patchwork.ozlabs.org/project/buildroot/patch/89462d4b3d365f2c6585eefeb35175813b5a8af2.1504194830.git.yann.morin.1998@free.fr/","project":{"id":27,"url":"http://patchwork.ozlabs.org/api/1.2/projects/27/?format=json","name":"Buildroot development","link_name":"buildroot","list_id":"buildroot.buildroot.org","list_email":"buildroot@buildroot.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<89462d4b3d365f2c6585eefeb35175813b5a8af2.1504194830.git.yann.morin.1998@free.fr>","list_archive_url":null,"date":"2017-08-31T15:54:01","name":"[2/2] fs/iso9660: remove support for grub","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"3999eefea9018c24f5ee3059d4a9fb981c96cd01","submitter":{"id":13903,"url":"http://patchwork.ozlabs.org/api/1.2/people/13903/?format=json","name":"Yann E. MORIN","email":"yann.morin.1998@free.fr"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/buildroot/patch/89462d4b3d365f2c6585eefeb35175813b5a8af2.1504194830.git.yann.morin.1998@free.fr/mbox/","series":[{"id":861,"url":"http://patchwork.ozlabs.org/api/1.2/series/861/?format=json","web_url":"http://patchwork.ozlabs.org/project/buildroot/list/?series=861","date":"2017-08-31T15:54:01","name":null,"version":1,"mbox":"http://patchwork.ozlabs.org/series/861/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808288/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808288/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","buildroot@lists.busybox.net"],"Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","buildroot@osuosl.org"],"Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=busybox.net\n\t(client-ip=140.211.166.138; helo=whitealder.osuosl.org;\n\tenvelope-from=buildroot-bounces@busybox.net;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"E20MmAWt\"; dkim-atps=neutral"],"Received":["from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjn4t2Q6Zz9s7G\n\tfor ;\n\tFri, 1 Sep 2017 01:54:54 +1000 (AEST)","from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 836D688833;\n\tThu, 31 Aug 2017 15:54:50 +0000 (UTC)","from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 8KC32XL70mKq; Thu, 31 Aug 2017 15:54:47 +0000 (UTC)","from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id CB3AD887E8;\n\tThu, 31 Aug 2017 15:54:47 +0000 (UTC)","from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 786551C2956\n\tfor ;\n\tThu, 31 Aug 2017 15:54:45 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 741C287AB5\n\tfor ;\n\tThu, 31 Aug 2017 15:54:45 +0000 (UTC)","from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id RqTFdQQvzdeF for ;\n\tThu, 31 Aug 2017 15:54:44 +0000 (UTC)","from mail-wr0-f194.google.com (mail-wr0-f194.google.com\n\t[209.85.128.194])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id E462D87AB0\n\tfor ; Thu, 31 Aug 2017 15:54:43 +0000 (UTC)","by mail-wr0-f194.google.com with SMTP id z91so23531wrc.1\n\tfor ; Thu, 31 Aug 2017 08:54:43 -0700 (PDT)","from localhost.localdomain\n\t(2a01cb088610730031abc111d534b7d4.ipv6.abo.wanadoo.fr.\n\t[2a01:cb08:8610:7300:31ab:c111:d534:b7d4])\n\tby smtp.gmail.com with ESMTPSA id\n\tb123sm434899wme.14.2017.08.31.08.54.40\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tThu, 31 Aug 2017 08:54:41 -0700 (PDT)"],"X-Virus-Scanned":["amavisd-new at osuosl.org","amavisd-new at osuosl.org"],"X-Greylist":"domain auto-whitelisted by SQLgrey-1.7.6","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=sender:from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=ipS3lIYOGHMMDeUpFaSCZh/k+9z8C4HHUnPtcS9Kj+A=;\n\tb=E20MmAWtJEepdO8AlyMWvAQiW1nNbbjdfFNcyt8OecsQ674SfzVO62D7tlgMzJ7dPO\n\tiI1y2Em9ZsBrw2mFTkyPjrWmUap4JzelMii4H72sLjqwztVuDFaTmdDnREY3/7KyFUne\n\tA6FH9g4kI3hUnZJyR9+LlvmKqaiebwrh0S5+MtYajeleap2iH3lL36wYaekc1P7QKRkW\n\tRyG0F7lEAH3239e2aQWmfIucZIX0vi+ONjseONA4ZhmFcQjTCPWXhNUgbugQaGsOovHa\n\tYAUkZvnDdAsuSlbTtFzpF4n96T0PFKm+gLgExhKMSg+zyDmA+Z906NXOjiMqJh0QAFz0\n\tVXiQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:sender:from:to:cc:subject:date:message-id\n\t:in-reply-to:references;\n\tbh=ipS3lIYOGHMMDeUpFaSCZh/k+9z8C4HHUnPtcS9Kj+A=;\n\tb=Zkha+80SQfpIBMjTxbnwgyd6j9iCRbNj4xyU5zWldcnW8aEn6VVitWElV7ieT7ouR3\n\t9pE1PRhHuk2+l/8VSHYSvHrs7Yy8zR5yO/OllZAb+CGkJTXiu7xGmMsLE+a+aLE0iaOM\n\tqlB7+3Sf4Ca6ygGOxKAlV5kLdY0ZjYLmHHJpFEVCX2nzjhTPKG9zUFy3IX2uu9WI4LBF\n\t+diGeBwbPJqKKeFfbhs3bKt2GjLvUpBNmIuCe02mxPAbqtzhv/CEnEYiU+UmsYHwNT73\n\tWy4e4wMnoEPl/VgHHZAh3umKWfWadDGcdOcvBvlIjbJom2rxK3kjse+ZGJGJFZTf5nrx\n\t9dHQ==","X-Gm-Message-State":"AHYfb5jH4YRLGUUjV4tQvVHY+g97N0YKH4uyHoULJrCrzyvVs8BX62dW\n\tLqKOShkaIGLk7O80","X-Google-Smtp-Source":"ADKCNb5r4hxrjf9nT22SyblVeZDGLQuPq37SyX8MnOSD7WZAdtGJlHxqS6nASmq6yE0yPGxNQck1CA==","X-Received":"by 10.223.134.161 with SMTP id 30mr3401858wrx.147.1504194882043; \n\tThu, 31 Aug 2017 08:54:42 -0700 (PDT)","From":"\"Yann E. MORIN\" ","To":"buildroot@buildroot.org","Date":"Thu, 31 Aug 2017 17:54:01 +0200","Message-Id":"<89462d4b3d365f2c6585eefeb35175813b5a8af2.1504194830.git.yann.morin.1998@free.fr>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"","References":"","Cc":"Thomas Petazzoni ,\n\t\"Yann E. MORIN\" ","Subject":"[Buildroot] [PATCH 2/2] fs/iso9660: remove support for grub","X-BeenThere":"buildroot@busybox.net","X-Mailman-Version":"2.1.18-1","Precedence":"list","List-Id":"Discussion and development of buildroot ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"buildroot-bounces@busybox.net","Sender":"\"buildroot\" "},"content":"grub has just been removed.\n\nSigned-off-by: \"Yann E. MORIN\" \nCc: Thomas Petazzoni \n---\n fs/iso9660/Config.in | 16 ++++------------\n fs/iso9660/grub.cfg | 7 -------\n fs/iso9660/iso9660.mk | 32 +-------------------------------\n 3 files changed, 5 insertions(+), 50 deletions(-)\n delete mode 100644 fs/iso9660/grub.cfg","diff":"diff --git a/fs/iso9660/Config.in b/fs/iso9660/Config.in\nindex d162586f38..842c987f21 100644\n--- a/fs/iso9660/Config.in\n+++ b/fs/iso9660/Config.in\n@@ -2,8 +2,7 @@ config BR2_TARGET_ROOTFS_ISO9660\n \tbool \"iso image\"\n \tdepends on (BR2_i386 || BR2_x86_64)\n \tdepends on BR2_LINUX_KERNEL\n-\tdepends on BR2_TARGET_GRUB || \\\n-\t\tBR2_TARGET_GRUB2_I386_PC || \\\n+\tdepends on BR2_TARGET_GRUB2_I386_PC || \\\n \t\tBR2_TARGET_SYSLINUX_ISOLINUX\n \tselect BR2_LINUX_KERNEL_INSTALL_TARGET \\\n \t if (!BR2_TARGET_ROOTFS_ISO9660_INITRD && !BR2_TARGET_ROOTFS_INITRAMFS)\n@@ -26,11 +25,6 @@ if BR2_TARGET_ROOTFS_ISO9660\n choice\n \tprompt \"Bootloader\"\n \n-config BR2_TARGET_ROOTFS_ISO9660_GRUB\n-\tbool \"grub\"\n-\tdepends on BR2_TARGET_GRUB\n-\tselect BR2_TARGET_GRUB_FS_ISO9660\n-\n config BR2_TARGET_ROOTFS_ISO9660_GRUB2\n \tbool \"grub2\"\n \tdepends on BR2_TARGET_GRUB2_I386_PC\n@@ -48,13 +42,11 @@ endchoice\n \n config BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU\n \tstring \"Boot menu config file\"\n-\tdefault \"fs/iso9660/menu.lst\" if BR2_TARGET_ROOTFS_ISO9660_GRUB\n \tdefault \"fs/iso9660/grub.cfg\" if BR2_TARGET_ROOTFS_ISO9660_GRUB2\n \tdefault \"fs/iso9660/isolinux.cfg\" if BR2_TARGET_ROOTFS_ISO9660_ISOLINUX\n \thelp\n \t Use this option to provide a custom bootloader configuration\n-\t file (menu.lst for Grub, grub.cfg for Grub 2, isolinux.cfg for\n-\t isolinux).\n+\t file (grub.cfg for Grub 2, isolinux.cfg for isolinux).\n \n \t Note that the strings __KERNEL_PATH__ and __INITRD_PATH__\n \t will automatically be replaced by the path to the kernel and\n@@ -82,7 +74,7 @@ config BR2_TARGET_ROOTFS_ISO9660_HYBRID\n \n endif\n \n-comment \"iso image needs a Linux kernel and one of grub, grub2 i386-pc or isolinux to be built\"\n+comment \"iso image needs a Linux kernel and either grub2 i386-pc or isolinux to be built\"\n \tdepends on BR2_i386 || BR2_x86_64\n \tdepends on !BR2_LINUX_KERNEL || \\\n-\t\t!(BR2_TARGET_GRUB || BR2_TARGET_GRUB2_I386_PC || BR2_TARGET_SYSLINUX_ISOLINUX)\n+\t\t!(BR2_TARGET_GRUB2_I386_PC || BR2_TARGET_SYSLINUX_ISOLINUX)\ndiff --git a/fs/iso9660/grub.cfg b/fs/iso9660/grub.cfg\ndeleted file mode 100644\nindex 5a74b2354a..0000000000\n--- a/fs/iso9660/grub.cfg\n+++ /dev/null\n@@ -1,7 +0,0 @@\n-set default=\"0\"\n-set timeout=\"10\"\n-\n-menuentry \"Buildroot\" {\n-\tlinux __KERNEL_PATH__ root=/dev/sr0\n-\tinitrd __INITRD_PATH__\n-}\ndiff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk\nindex 478cb0239b..d49d593bd6 100644\n--- a/fs/iso9660/iso9660.mk\n+++ b/fs/iso9660/iso9660.mk\n@@ -45,16 +45,7 @@ else\n ROOTFS_ISO9660_TARGET_DIR = $(TARGET_DIR)\n endif\n \n-ifeq ($(BR2_TARGET_ROOTFS_ISO9660_GRUB),y)\n-ROOTFS_ISO9660_DEPENDENCIES += grub\n-ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH = \\\n-\t$(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst\n-ROOTFS_ISO9660_BOOT_IMAGE = boot/grub/stage2_eltorito\n-define ROOTFS_ISO9660_INSTALL_BOOTLOADER\n-\t$(INSTALL) -D -m 0644 $(GRUB_DIR)/stage2/stage2_eltorito \\\n-\t\t$(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/stage2_eltorito\n-endef\n-else ifeq ($(BR2_TARGET_ROOTFS_ISO9660_GRUB2),y)\n+ifeq ($(BR2_TARGET_ROOTFS_ISO9660_GRUB2),y)\n ROOTFS_ISO9660_DEPENDENCIES += grub2\n ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH = \\\n \t$(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/grub.cfg\n@@ -86,33 +77,12 @@ endef\n \n ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_PREPARATION\n \n-# Grub splash screen disabling\n-ifeq ($(BR2_TARGET_ROOTFS_ISO9660_GRUB),y)\n-ifeq ($(BR2_TARGET_GRUB_SPLASH),)\n-define ROOTFS_ISO9660_DISABLE_SPLASHSCREEN\n-\t$(SED) '/^splashimage/d' $(ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH)\n-endef\n-ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_DISABLE_SPLASHSCREEN\n-endif\n-endif\n-\n define ROOTFS_ISO9660_DISABLE_EXTERNAL_INITRD\n \t$(SED) '/__INITRD_PATH__/d' $(ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH)\n endef\n \n ifeq ($(ROOTFS_ISO9660_USE_INITRD),YES)\n \n-# Copy Grub splashscreen to temporary filesystem\n-ifeq ($(BR2_TARGET_ROOTFS_ISO9660_GRUB),y)\n-ifeq ($(BR2_TARGET_GRUB_SPLASH),y)\n-define ROOTFS_ISO9660_INSTALL_SPLASHSCREEN\n-\t$(INSTALL) -D -m 0644 $(TARGET_DIR)/boot/grub/splash.xpm.gz \\\n-\t\t$(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/splash.xpm.gz\n-endef\n-ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_INSTALL_SPLASHSCREEN\n-endif\n-endif\n-\n # Copy the kernel to temporary filesystem\n define ROOTFS_ISO9660_COPY_KERNEL\n \t$(INSTALL) -D -m 0644 $(LINUX_IMAGE_PATH) \\\n","prefixes":["2/2"]}