From patchwork Sat Dec 16 16:09:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1876940 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SsrfP04FZz23p3 for ; Sun, 17 Dec 2023 03:10:37 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 31DAA41759; Sat, 16 Dec 2023 16:10:35 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 31DAA41759 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tFmYAlHXiFnX; Sat, 16 Dec 2023 16:10:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 4214B41774; Sat, 16 Dec 2023 16:10:32 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 4214B41774 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 345761BF28A for ; Sat, 16 Dec 2023 16:10:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 0BE4F40156 for ; Sat, 16 Dec 2023 16:10:07 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 0BE4F40156 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OGqpWGvVTIMe for ; Sat, 16 Dec 2023 16:10:05 +0000 (UTC) Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by smtp2.osuosl.org (Postfix) with ESMTPS id 5E60E400B8 for ; Sat, 16 Dec 2023 16:10:05 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 5E60E400B8 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-40c3ceded81so15797385e9.1 for ; Sat, 16 Dec 2023 08:10:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702743003; x=1703347803; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=5abAecsMtmH6leQkrJ9rlv3NPsAJ2jMe0Jel79m9Uiw=; b=pj8bWuRM+CbJeBcnL6vj6HSl3y9HAecyHfR3vlWnLmIPv4XZTmyvDrOGkic8zUzLPR isOONy+5C9dLFe0iTe35bIog1tf32h6xilllRNn8nL9x0Ix/DYD4/xzq/5+3EQq2tTpl 7IgwWo1SosNyJDfNnFR7dYxOu1ShVFfm4gXqpiRMu7oxm7HeA9OvnlKCJw23k73QEREC BwpuT9S6NIUN39MLxkhZQAy7NzA35KRaCbbim4O2T9uANniCS+HK0SZvCJMPLRW/stwb Bh0ncZERHovQ61dbZieAvx3EM5fLiU0guhCqd4VF6D0NldTfxgicBqfq2NGRfb0yUWrX xsAg== X-Gm-Message-State: AOJu0Yxmow6/p7vGaGLJ6eT1tNhRXFyvbP6Z6sUhcgz0H4UJ7goD8uz7 6SwzkMSWpkA9rXulBazGDeAlQSFCnH4= X-Google-Smtp-Source: AGHT+IGEo24YVF87IAik2phkwUH6EluS1nkjY5fI0ezxrD65hMoB3cPRA38noECs01g2hQd4SB3Z/A== X-Received: by 2002:a05:600c:5022:b0:40c:3e95:f658 with SMTP id n34-20020a05600c502200b0040c3e95f658mr6322770wmr.69.1702743002897; Sat, 16 Dec 2023 08:10:02 -0800 (PST) Received: from landeda.home ([2a01:cb19:8290:3800:4f89:5708:1633:580e]) by smtp.gmail.com with ESMTPSA id k40-20020a05600c1ca800b0040b45356b72sm36319926wms.33.2023.12.16.08.10.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Dec 2023 08:10:02 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 16 Dec 2023 17:09:54 +0100 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702743003; x=1703347803; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=5abAecsMtmH6leQkrJ9rlv3NPsAJ2jMe0Jel79m9Uiw=; b=jGiT349ybaIjkRDHDKVhcwXMAVpZvntbXIwI2l900L3QmPFz2/Lc8Xjn41XsUO6Rbe S83EJjudbSUjjc3J1ZhnIQcIw9l/Ruk/pcG0lex+9y4NVsGg4b1sJcvpjHu0lnKSou8J nDgKqfnEZJFAhyPnEuA298gdPLwWLBSnaqqb4FZCY5PPJxM5oOMQMkWh8tLA4ieXi/t5 mNqbWa3Q/iKsBRr4CoqzlmrlQ1rG50/FVH4TAtTfUSvb2jBgQspkoyHsaHymY0Ow9h10 GEC9GWvpvSD6b5dxps8lKlAk0ZEVpgATXIKba8F5EzLztXqfhySQhSTL0Tu5jWGwhOhJ njLQ== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=jGiT349y Subject: [Buildroot] [PATCH 1/9] doc/manual: fixup ordered lists X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Yann E. MORIN" , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Recent asiidoc versions (at least 10.2.0 is known to report that), rendering the manual yields a few warnings related to ordered lists: asciidoc: WARNING: customize-quick-guide.adoc: line 13: list item index: expected 2 got 1 asciidoc: WARNING: customize-quick-guide.adoc: line 15: list item index: expected 3 got 1 [...] asciidoc: WARNING: customize-quick-guide.adoc: line 65: list item index: expected 13 got 1 asciidoc: WARNING: customize-quick-guide.adoc: line 66: list item index: expected 14 got 1 asciidoc: WARNING: adding-packages-gettext.adoc: line 30: list item index: expected 2 got 1 asciidoc: WARNING: adding-packages-gettext.adoc: line 41: list item index: expected 3 got 1 The reason is that we use the same index to tell asciidoc to automatically number items. However, the official way to provide an automatic index is to write no index: https://docs.asciidoctor.org/asciidoc/latest/lists/ordered/ [...] since the numbering is obvious, the AsciiDoc processor will insert the numbers for you if you omit them: [...] If you number the ordered list explicitly, you have to manually keep the list numerals sequential. Otherwise, you will get a warning. So, abide by the documentation, and drop the repeating indices to ordered lists where we want automatic numbering. Note that there is another ordered list, in adding-packages-directory.adoc, but it does use explicit, sequential numbering. For consistency within the whole document, we also convert it. To avoid extra useless churn, the idnentation of the items is not changed to match the elided indices. Signed-off-by: Yann E. MORIN --- docs/manual/adding-packages-directory.adoc | 14 +++++------ docs/manual/adding-packages-gettext.adoc | 6 ++--- docs/manual/customize-quick-guide.adoc | 28 +++++++++++----------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/manual/adding-packages-directory.adoc b/docs/manual/adding-packages-directory.adoc index 5a0f298eb1..b7519cc01a 100644 --- a/docs/manual/adding-packages-directory.adoc +++ b/docs/manual/adding-packages-directory.adoc @@ -44,13 +44,13 @@ project after an empty line. As a convention specific to Buildroot, the ordering of the attributes is as follows: -1. The type of option: +bool+, +string+... with the prompt -2. If needed, the +default+ value(s) -3. Any dependencies on the target in +depends on+ form -4. Any dependencies on the toolchain in +depends on+ form -5. Any dependencies on other packages in +depends on+ form -6. Any dependency of the +select+ form -7. The help keyword and help text. +. The type of option: +bool+, +string+... with the prompt +. If needed, the +default+ value(s) +. Any dependencies on the target in +depends on+ form +. Any dependencies on the toolchain in +depends on+ form +. Any dependencies on other packages in +depends on+ form +. Any dependency of the +select+ form +. The help keyword and help text. You can add other sub-options into a +if BR2_PACKAGE_LIBFOO...endif+ statement to configure particular things in your software. You can look at diff --git a/docs/manual/adding-packages-gettext.adoc b/docs/manual/adding-packages-gettext.adoc index e9c6968e79..739bed25d5 100644 --- a/docs/manual/adding-packages-gettext.adoc +++ b/docs/manual/adding-packages-gettext.adoc @@ -23,11 +23,11 @@ Due to this, and in order to make sure that Native Language Support is properly handled, packages in Buildroot that can use NLS support should: -1. Ensure NLS support is enabled when +BR2_SYSTEM_ENABLE_NLS=y+. This +. Ensure NLS support is enabled when +BR2_SYSTEM_ENABLE_NLS=y+. This is done automatically for 'autotools' packages and therefore should only be done for packages using other package infrastructures. -1. Add +$(TARGET_NLS_DEPENDENCIES)+ to the package +. Add +$(TARGET_NLS_DEPENDENCIES)+ to the package +_DEPENDENCIES+ variable. This addition should be done unconditionally: the value of this variable is automatically adjusted by the core infrastructure to contain the relevant list of @@ -38,7 +38,7 @@ should: also contains +gettext+ in order to get the full-blown 'gettext' implementation. -1. If needed, add +$(TARGET_NLS_LIBS)+ to the linker flags, so that +. If needed, add +$(TARGET_NLS_LIBS)+ to the linker flags, so that the package gets linked with +libintl+. This is generally not needed with 'autotools' packages as they usually detect automatically that they should link with +libintl+. However, diff --git a/docs/manual/customize-quick-guide.adoc b/docs/manual/customize-quick-guide.adoc index 627ecbacb1..315027c590 100644 --- a/docs/manual/customize-quick-guide.adoc +++ b/docs/manual/customize-quick-guide.adoc @@ -9,11 +9,11 @@ now summarize all this by providing step-by-step instructions to storing your project-specific customizations. Clearly, the steps that are not relevant to your project can be skipped. -1. +make menuconfig+ to configure toolchain, packages and kernel. -1. +make linux-menuconfig+ to update the kernel config, similar for +. +make menuconfig+ to configure toolchain, packages and kernel. +. +make linux-menuconfig+ to update the kernel config, similar for other configuration like busybox, uclibc, ... -1. +mkdir -p board//+ -1. Set the following options to +board///.config+ +. +mkdir -p board//+ +. Set the following options to +board///.config+ (as far as they are relevant): * +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE+ * +BR2_PACKAGE_BUSYBOX_CONFIG+ @@ -21,7 +21,7 @@ your project can be skipped. * +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_CONFIG_FILE+ * +BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE+ * +BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE+ -1. Write the configuration files: +. Write the configuration files: * +make linux-update-defconfig+ * +make busybox-update-config+ * +make uclibc-update-config+ @@ -29,38 +29,38 @@ your project can be skipped. board///at91bootstrap3.config+ * +make barebox-update-defconfig+ * +make uboot-update-defconfig+ -1. Create +board///rootfs-overlay/+ and fill it +. Create +board///rootfs-overlay/+ and fill it with additional files you need on your rootfs, e.g. +board///rootfs-overlay/etc/inittab+. Set +BR2_ROOTFS_OVERLAY+ to +board///rootfs-overlay+. -1. Create a post-build script +. Create a post-build script +board///post_build.sh+. Set +BR2_ROOTFS_POST_BUILD_SCRIPT+ to +board///post_build.sh+ -1. If additional setuid permissions have to be set or device nodes have +. If additional setuid permissions have to be set or device nodes have to be created, create +board///device_table.txt+ and add that path to +BR2_ROOTFS_DEVICE_TABLE+. -1. If additional user accounts have to be created, create +. If additional user accounts have to be created, create +board///users_table.txt+ and add that path to +BR2_ROOTFS_USERS_TABLES+. -1. To add custom patches to certain packages, set +BR2_GLOBAL_PATCH_DIR+ +. To add custom patches to certain packages, set +BR2_GLOBAL_PATCH_DIR+ to +board///patches/+ and add your patches for each package in a subdirectory named after the package. Each patch should be called +--.patch+. -1. Specifically for the Linux kernel, there also exists the option +. Specifically for the Linux kernel, there also exists the option +BR2_LINUX_KERNEL_PATCH+ with as main advantage that it can also download patches from a URL. If you do not need this, +BR2_GLOBAL_PATCH_DIR+ is preferred. U-Boot, Barebox, at91bootstrap and at91bootstrap3 also have separate options, but these do not provide any advantage over +BR2_GLOBAL_PATCH_DIR+ and will likely be removed in the future. -1. If you need to add project-specific packages, create +. If you need to add project-specific packages, create +package//+ and place your packages in that directory. Create an overall +.mk+ file that includes the +.mk+ files of all your packages. Create an overall +Config.in+ file that sources the +Config.in+ files of all your packages. Include this +Config.in+ file from Buildroot's +package/Config.in+ file. -1. +make savedefconfig+ to save the buildroot configuration. -1. +cp defconfig configs/_defconfig+ +. +make savedefconfig+ to save the buildroot configuration. +. +cp defconfig configs/_defconfig+ From patchwork Sat Dec 16 16:09:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1876939 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Ssrf75hbKz23p3 for ; Sun, 17 Dec 2023 03:10:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 8B150417E2; Sat, 16 Dec 2023 16:10:21 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 8B150417E2 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id T7Grh5UGWDfQ; Sat, 16 Dec 2023 16:10:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 9B7484177B; Sat, 16 Dec 2023 16:10:19 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 9B7484177B X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4926C1BF28A for ; Sat, 16 Dec 2023 16:10:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 302FA81ED7 for ; Sat, 16 Dec 2023 16:10:06 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 302FA81ED7 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MBr3yLzK9zhM for ; Sat, 16 Dec 2023 16:10:05 +0000 (UTC) Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by smtp1.osuosl.org (Postfix) with ESMTPS id 632C481EAA for ; Sat, 16 Dec 2023 16:10:05 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 632C481EAA Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-40c60dfa5bfso20044195e9.0 for ; Sat, 16 Dec 2023 08:10:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702743003; x=1703347803; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=C9PPUDxcRIdiJVn5GuGiptaf8upR5QlBKQ2O8IXZdY8=; b=w6LywhJ0iLM4Jd7w+/dx0h3+xj/M6hKNqZjyqeCoTjfEJVhT2DrGj84QoCxOPtvq/v fS3YjRkLpoSNbSL4oNhfTaHNcfeD9F9n+P6PBKeAhvuQ9dMvhkREUg3kOJ4/cDnWzQgb jcSjPAdQtGWbkeCukU3aaM9yiM8LaiGE527QoUV1JCC9hM0jg6lZH8M3Ug5oec6u09w8 LlwT9NUyFk1LTm1G8lEi9UUjPhkWcxuKHce2flAg5Wk4Yn74TDI2JMavorSoq2yUda7M zCyzelHHO2UqQZl5SlhjhNmWCNdjP2IZ3nueMymxqkNDnsg+WJZ/MLnNjmIAtpG2BSH3 Or6A== X-Gm-Message-State: AOJu0YwT6Eui4/1X6v+EeLsaJC1pBMtF6Tz4JPt8yxelZMzk2xGp/D4+ +W9CpjbAR4ox8ky9HhGtbe570glcnCE= X-Google-Smtp-Source: AGHT+IFq/wQlB6yE88voYViS+EtC7IPdESqevKIrqkW8X4hABS1eO/sGpHQfAoPNVpVgpb0wvYTalg== X-Received: by 2002:a05:600c:204c:b0:40c:2788:28f3 with SMTP id p12-20020a05600c204c00b0040c278828f3mr7148437wmg.79.1702743003340; Sat, 16 Dec 2023 08:10:03 -0800 (PST) Received: from landeda.home ([2a01:cb19:8290:3800:4f89:5708:1633:580e]) by smtp.gmail.com with ESMTPSA id k40-20020a05600c1ca800b0040b45356b72sm36319926wms.33.2023.12.16.08.10.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Dec 2023 08:10:03 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 16 Dec 2023 17:09:55 +0100 Message-ID: <678f73c0753eb09e05301df347c75928b4444f26.1702742998.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702743003; x=1703347803; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=C9PPUDxcRIdiJVn5GuGiptaf8upR5QlBKQ2O8IXZdY8=; b=SoC33cuZEzpxOaCrPpl7GCCzfEkV+qHHVoKAhp3Drpw9KwVXP95yuXzP9MZPq2v02D vUvYwsEVUnFN62fpNRZztO+0JqrfXlAtLeTwH5o1F6Xb1y9Bouu7++cpuRM27pA5ZOyW xQET8swvyU7a1Z0gUerx2pZVdh/C75n0+OZA/VDwurWhAMf3MQGPlsUbrgmMCLq/Bxa0 hs9BmaCUsl53zjrKW5tjOjzzf20ALmRcu9+x370iRamJnbXyhhokmsU6XGP0FoYAkrXH NucuBndSdTs04x9KMqS0IDAh2H3WT6l/j7UgOUbCn7jw650jwo2BLu6RY71DdXs4FnA4 bQ4Q== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=SoC33cuZ Subject: [Buildroot] [PATCH 2/9] support/dependencies: make git a mandatory dependency X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Yann E. MORIN" , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Currently, we only require wget as a download tool. However, git is very pervasive and used in many of the packages, making it a de facto requirement. Act on that situation and promote git from an optional dependency to a mandatory dependency. Reported-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- docs/manual/prerequisite.adoc | 2 +- package/pkg-generic.mk | 8 -------- support/dependencies/dependencies.sh | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/docs/manual/prerequisite.adoc b/docs/manual/prerequisite.adoc index 262a5153f5..6f07cba551 100644 --- a/docs/manual/prerequisite.adoc +++ b/docs/manual/prerequisite.adoc @@ -41,6 +41,7 @@ between distributions). * Source fetching tools: ** +wget+ +** +git+ [[requirement-optional]] @@ -76,7 +77,6 @@ corresponding tool on the host system: + ** +bazaar+ ** +cvs+ -** +git+ ** +mercurial+ ** +scp+ ** +sftp+ diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 577a148c1e..87931f09c1 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1240,7 +1240,6 @@ endif ifeq ($$($(2)_SITE_METHOD),svn) DL_TOOLS_DEPENDENCIES += svn else ifeq ($$($(2)_SITE_METHOD),git) -DL_TOOLS_DEPENDENCIES += git ifneq ($$($(2)_GIT_LFS),) DL_TOOLS_DEPENDENCIES += git-lfs endif @@ -1254,13 +1253,6 @@ else ifeq ($$($(2)_SITE_METHOD),cvs) DL_TOOLS_DEPENDENCIES += cvs endif # SITE_METHOD -# cargo/go vendoring (may) need git -ifeq ($$($(2)_DOWNLOAD_POST_PROCESS),cargo) -DL_TOOLS_DEPENDENCIES += git -else ifeq ($$($(2)_DOWNLOAD_POST_PROCESS),go) -DL_TOOLS_DEPENDENCIES += git -endif - DL_TOOLS_DEPENDENCIES += $$(call extractor-system-dependency,$$($(2)_SOURCE)) # Ensure all virtual targets are PHONY. Listed alphabetically. diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 6e7d067ccd..e18e799922 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -154,7 +154,7 @@ fi # Check that a few mandatory programs are installed missing_progs="no" -for prog in perl tar wget cpio unzip rsync bc cmp find xargs ${DL_TOOLS} ; do +for prog in perl tar wget git cpio unzip rsync bc cmp find xargs ${DL_TOOLS} ; do if ! which $prog > /dev/null ; then echo "You must install '$prog' on your build machine"; missing_progs="yes" From patchwork Sat Dec 16 16:09:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1876943 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Ssrg60RkBz23p3 for ; Sun, 17 Dec 2023 03:11:14 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 40E3B418FF; Sat, 16 Dec 2023 16:11:12 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 40E3B418FF X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aJr8MMNxGjOK; Sat, 16 Dec 2023 16:11:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 8F422417B5; Sat, 16 Dec 2023 16:11:10 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 8F422417B5 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id A83591BF28A for ; Sat, 16 Dec 2023 16:10:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 7D9B281F39 for ; Sat, 16 Dec 2023 16:10:08 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 7D9B281F39 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AbSIdOvOeoPe for ; Sat, 16 Dec 2023 16:10:06 +0000 (UTC) Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by smtp1.osuosl.org (Postfix) with ESMTPS id 48F5781EAA for ; Sat, 16 Dec 2023 16:10:06 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 48F5781EAA Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-40c60dfa5bfso20044275e9.0 for ; Sat, 16 Dec 2023 08:10:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702743004; x=1703347804; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=l+IV0MqTaqzzF/hAeo097AsEz8qkieC0XiQmkhYPtog=; b=pCG9qsU9ZNUjeosmxl5cjbxUTwwM4g2Bl/0J+x5SoxTAoVCHWCep69ZG8nDuo3Gp5W N9JZDM5Jd/1RYFZQahPrRQP8EAeZQk66JN2wEZ4frReWbljJ34N700ABNd+SUULq6+rQ xbEZuWFU1FTksFTUlxaGXXaVyqmWmGniT7dOvFFikrbNmygqwv49Km6w+0ykKb/sGaDB Uzn4b+tjQ4t5wMilIe4Mbw/HEMyDhCGXVbuTBmAspOXEU9cx/TAAO29KXdWEHCVxT+Iz /7FjzhG/FWQJWnFbJz3qoflF23MfjRZ4SiwKN0ODjH/I5iXqm5OdaDQqIB6/YrBzO2GQ 6eXw== X-Gm-Message-State: AOJu0YxKPaXjDtBnCdAovlK2IwiRg6MV+KtxepQ7jxl0+XxiWqVsV5mc bX8oJwkkBisHSSmyzEbW66a4AmFgaTQ= X-Google-Smtp-Source: AGHT+IGnkgFWP4DE2a5kUg0kRKJKda2Mz1DKwSEtt24s2wIqeSeWKHxguP7zGhw3p6ddqtHuZNed9Q== X-Received: by 2002:a05:600c:1c9d:b0:40c:30fb:1df6 with SMTP id k29-20020a05600c1c9d00b0040c30fb1df6mr6859972wms.128.1702743003766; Sat, 16 Dec 2023 08:10:03 -0800 (PST) Received: from landeda.home ([2a01:cb19:8290:3800:4f89:5708:1633:580e]) by smtp.gmail.com with ESMTPSA id k40-20020a05600c1ca800b0040b45356b72sm36319926wms.33.2023.12.16.08.10.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Dec 2023 08:10:03 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 16 Dec 2023 17:09:56 +0100 Message-ID: <7d386d68c77c941282943a8e4d0a57bd989fb73b.1702742998.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702743004; x=1703347804; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=l+IV0MqTaqzzF/hAeo097AsEz8qkieC0XiQmkhYPtog=; b=Pd9t/jfdRbNnY34ezoCmKgBbsSszd69xRXO0EAw6KtnicYKNWOTGndHkGe3/SNuKjT rxAzcyBhXJkfU/1mp2fiNh9l2h9AxZ70WpTXCO1Pyn2xG1I8kID6elItwP6En7KKJib9 BkNUhOOMd7FioorUOsCDkmLIHgyZDliBP7E+r7Ur8oKMvHUvFSeqncT1RHvM/NOrqznk PToYWNjCpZ9hS4eS7trKo9BnnuYlLHdoLxJLuOSDbeEdVH8e/0m9wXAb8ldNzvaolZ4g Kht/7ZqUZynnFPuxmxebIyuuiks9S7+z6mkn8D5SReaHo/so67f1w7spcdqF3LyswmVg 1JFg== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=Pd9t/jfd Subject: [Buildroot] [PATCH 3/9] support/docker: retry even more X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Yann E. MORIN" , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" When downloading from and old Debian snapshot, connections can timeout while their storage backend retrieves the requested file from cold (very cold!) storage, and this can take quite some time if that file has not been retrieved for a long time, so much so that retrying three times might not be enough. Increase the number of retries yet a little bit more to avoid the issue. Signed-off-by: Yann E. MORIN --- support/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index 8c6e2add60..dd9b9c0f93 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -20,8 +20,8 @@ COPY apt-sources.list /etc/apt/sources.list # The container has no package lists, so need to update first RUN dpkg --add-architecture i386 && \ - apt-get -o APT::Retries=3 update -y -RUN apt-get -o APT::Retries=3 install -y --no-install-recommends \ + apt-get -o APT::Retries=5 update -y +RUN apt-get -o APT::Retries=5 install -y --no-install-recommends \ bc \ build-essential \ bzr \ From patchwork Sat Dec 16 16:09:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1876942 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Ssrfs02WPz23p3 for ; Sun, 17 Dec 2023 03:11:00 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 241764179A; Sat, 16 Dec 2023 16:10:59 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 241764179A X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RawMi9BJFqty; Sat, 16 Dec 2023 16:10:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 6BB3541836; Sat, 16 Dec 2023 16:10:57 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6BB3541836 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 629671BF28A for ; Sat, 16 Dec 2023 16:10:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 37B0C400B8 for ; Sat, 16 Dec 2023 16:10:07 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 37B0C400B8 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id H4Bv_DJBrDMf for ; Sat, 16 Dec 2023 16:10:06 +0000 (UTC) Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by smtp2.osuosl.org (Postfix) with ESMTPS id 1D81A40146 for ; Sat, 16 Dec 2023 16:10:06 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 1D81A40146 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-40c48d7a7a7so16252275e9.3 for ; Sat, 16 Dec 2023 08:10:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702743004; x=1703347804; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=sYZLrsqazpTy0MHZviDjEebIeZMJN6qXHR7zhxwQrvw=; b=kB6fhOCL/5b/d56ZoXbJ+WC/2Js8QSe7M7xxHgo8dwo/09RlXSBsNd9tthtZ4DqLMi Top7JvhegEYbVe/E5WawrV3bzM6zne33kzCzRGKHGtyF2pGixS665fd7vnFd05g8eQR6 4EpuerrW7UmqyKWiohquDNXbVyGm39vdJb0YY/hPhF9FAB1ymut4xa8mXhPZF9cdo82S JE5qBittIhQr35lEbpSGNoY7l+c16ajVFkrutXPy7aMr37lAstY8D6JEwENT1IjSVIXH TcpfZHGycUek1Qt3enkxWDgxwTw35zG1z7LFNWgRTxBkqmOmV0SK7OYhiDUTuk3fOlOi gqjw== X-Gm-Message-State: AOJu0YzCou0jpajjgYFBxMLEDs0MOXjDvzhwfogGOKmuh6okKWrpxQ4E /Pi7vQ8ZF3GnsEsUayT45qD5u2Mprmg= X-Google-Smtp-Source: AGHT+IF40wQQPv80p7MxS3dwHpgixCPJqyl3FbyClx1AE8aVtsdqSCJqFOwK7LczJnLJhrOusu2NCQ== X-Received: by 2002:a05:600c:1d23:b0:40c:6a86:3f2e with SMTP id l35-20020a05600c1d2300b0040c6a863f2emr1955643wms.96.1702743004194; Sat, 16 Dec 2023 08:10:04 -0800 (PST) Received: from landeda.home ([2a01:cb19:8290:3800:4f89:5708:1633:580e]) by smtp.gmail.com with ESMTPSA id k40-20020a05600c1ca800b0040b45356b72sm36319926wms.33.2023.12.16.08.10.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Dec 2023 08:10:03 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 16 Dec 2023 17:09:57 +0100 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702743004; x=1703347804; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=sYZLrsqazpTy0MHZviDjEebIeZMJN6qXHR7zhxwQrvw=; b=MoTUOm2yi9JfjwRe7o48cd8RfvJNnKreUBp6i98/B+bfM4C/T68xI4sNuiNQlrdCei uAbaKC+fwIlA0Kd3ohyX7+b8O8JY3ZjeqCFvPWBESjQJTgdqDqSW9kHWhrtNo95ZdUEG ZwSU7Gz1T/nyPXxq8yOEHrAfgFPlNi/ZHc+5GTBtzacmh5xOudONtQZWDBu68z7l2N59 PIN0V/wn76Ujrg2qz1QqdRZ7QNsz3noFFdk0r+gcyGKcIN8MqXYzq6Tpb5FjwIOSpiyd VdTeVfalDxBe0+b09Hb6bvwop7UAl/ExfiEIZm5O8gn7spIWGeFnJST354VIwbDCyllJ RfMQ== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=MoTUOm2y Subject: [Buildroot] [PATCH 4/9] support/docker: allow the br-user to become root X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Yann E. MORIN" , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" When our Dockerfiles (and images) get reused by users, they might need to locally add new packages or tweak the iamge to heir local needs. It is posisble to become root in the container, but implies running a second command from another terminal, like so: (term-1) $ ./utils/docker-run $ colordiff --version bash: colordiff: command not found (termn-2) $ docker exec -u 0:0 -ti NAME sh # apt install -y colordiff $ colordiff --version diff (GNU diffutils) 3.7 [...] Usually, however, people are a bit lazy and prefer to go the traditional way of using sudo. ;-) So, register the br-user to become root by running (exactly!): $ sudo su - This will allow acutally becoing root without prompting for a password, but no other command will be accepted, and no other paramter will be accepted either, so that it is still possible to catch packages that try to run sudo as part of their build/install process. Signed-off-by: Yann E. MORIN --- support/docker/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index dd9b9c0f93..b62cf32824 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -49,6 +49,7 @@ RUN apt-get -o APT::Retries=5 install -y --no-install-recommends \ rsync \ shellcheck \ subversion \ + sudo \ unzip \ wget \ && \ @@ -60,7 +61,9 @@ RUN sed -i 's/# \(en_US.UTF-8\)/\1/' /etc/locale.gen && \ /usr/sbin/locale-gen RUN useradd -ms /bin/bash br-user && \ - chown -R br-user:br-user /home/br-user + chown -R br-user:br-user /home/br-user && \ + printf 'br-user ALL=NOPASSWD: /bin/su -\n' >/etc/sudoers.d/br-user && \ + chmod 0440 /etc/sudoers.d/br-user USER br-user WORKDIR /home/br-user From patchwork Sat Dec 16 16:09:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1876946 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Ssrgq664sz23p3 for ; Sun, 17 Dec 2023 03:11:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 0F48960FA7; Sat, 16 Dec 2023 16:11:50 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 0F48960FA7 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 32EDk96ZKN-5; Sat, 16 Dec 2023 16:11:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 3710860F5F; Sat, 16 Dec 2023 16:11:48 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 3710860F5F X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 457EF1BF867 for ; Sat, 16 Dec 2023 16:10:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 2BD3460B99 for ; Sat, 16 Dec 2023 16:10:09 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 2BD3460B99 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RiL5ku7MqcK6 for ; Sat, 16 Dec 2023 16:10:07 +0000 (UTC) Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by smtp3.osuosl.org (Postfix) with ESMTPS id E24A160B92 for ; Sat, 16 Dec 2023 16:10:06 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org E24A160B92 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-40c6ea99429so12257115e9.3 for ; Sat, 16 Dec 2023 08:10:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702743005; x=1703347805; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=B9AC7J69nFOif483FbICGfW2qwCO5U7Z/xNzISTTl2Y=; b=nxxwHr3X/wYk5t/BP5Hu87fkKVibCU07IHGoTI9kqrd+VGX4OkhN5gPol6JF1Wl8Fp 2w8JO2DAzSi3qTV5iwGLDHTKX4GCUSuCRFwPY6Ph+EN4fdhaHcV/U6Bfuopu2VXacZN2 0XIKTXxn4KgBcL5uqI36/mFrco8XBaRPdFmQ8l9jReonDh2GwyLmyC0XZAx7F6JFrjqm IZUKTmyniLNbtxGWvnzMWaiQEoPASZ15y3izGtKL/IWkZ7dzmvcl1ztIbsrCVXiu6cNX nxLzDfwPEbqjdEXZNeF1rBMleOKpk34P9lRG71oz8JpzdOOQ0nozd6Oa4NZLSV5GT+j5 DGsQ== X-Gm-Message-State: AOJu0YyJR+SLE11JBid72IclXj/xvDzdHVizenTdTIzFdbCDGYzda41z my4SZaKKJfE/boL1G1svs4tFMqKHx0E= X-Google-Smtp-Source: AGHT+IEBw3+tRDfZOJQA/iSb5VQzS0D9EOvRo9pGSiXAjt0V7tPfNOV9jJCP5ZctWxVTk2A6ZNHlUA== X-Received: by 2002:a05:600c:198d:b0:40c:6cab:8b04 with SMTP id t13-20020a05600c198d00b0040c6cab8b04mr958667wmq.20.1702743004706; Sat, 16 Dec 2023 08:10:04 -0800 (PST) Received: from landeda.home ([2a01:cb19:8290:3800:4f89:5708:1633:580e]) by smtp.gmail.com with ESMTPSA id k40-20020a05600c1ca800b0040b45356b72sm36319926wms.33.2023.12.16.08.10.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Dec 2023 08:10:04 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 16 Dec 2023 17:09:58 +0100 Message-ID: <694a881fb3cb6ae56ab470d11bb711b881cbab2c.1702742998.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702743005; x=1703347805; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=B9AC7J69nFOif483FbICGfW2qwCO5U7Z/xNzISTTl2Y=; b=c9HJTII4rsPf7p1d9WU7VRphRwENvP5CcfkDmSA5lM3+d1RHNHfcKKJnJ06NZSa3zD OWncqHpxEvvQec3wm4WSiy5l10hSRXWESGAyAd9QMwg0vHUPc4pi8QZVAZaBq3HOrhCZ zqAV+oYod90THuu27Rs7wBhe1lQRTwq+pGbQiL04Rzfoe9gsMd+M88w6M5m7zCIClsoM AoLELG6Ul4BRqWXuHMYA7MENczJ4OR0chiuaVvyIF02nmtK5RcSsgdUr/AjC7Whd7F/7 ehPPzGOeUa3W68asqrfSsqLWpbAgUtWCbZi6zIVQDnyyuMx8NrDYqS6MSG9amdCI3UxQ FzwQ== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=c9HJTII4 Subject: [Buildroot] [PATCH 5/9] support/docker: introduce per-distribution sub-directory X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Yann E. MORIN" , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Currently, we only generate one docker image, for use by the gitlab-ci infra. However, users have expressed an interest in using that image for other uses, like: - reproducing build failures as reported by the gitlab-ci jobs, - having a ready-to-use base image to use as-is, or as a template for further customisations. Additionally, some users have reported the need for similar base images, but based off different distros, with the same goals as above, plus: - reproducing build failures reported by users on other distros. As a first step toward providing such images, move our Dockerfile and its accompanying resources to a sub-directory, named after the distribution it is based off. Add a symlink that allows to also reference our base image without having to know what distribution it is based on. Signed-off-by: Yann E. MORIN --- support/docker/base | 1 + support/docker/{ => debian-bullseye}/Dockerfile | 2 +- support/docker/{ => debian-bullseye}/apt-sources.list | 0 3 files changed, 2 insertions(+), 1 deletion(-) create mode 120000 support/docker/base rename support/docker/{ => debian-bullseye}/Dockerfile (97%) rename support/docker/{ => debian-bullseye}/apt-sources.list (100%) diff --git a/support/docker/base b/support/docker/base new file mode 120000 index 0000000000..95f9ccb9fc --- /dev/null +++ b/support/docker/base @@ -0,0 +1 @@ +debian-bullseye \ No newline at end of file diff --git a/support/docker/Dockerfile b/support/docker/debian-bullseye/Dockerfile similarity index 97% rename from support/docker/Dockerfile rename to support/docker/debian-bullseye/Dockerfile index b62cf32824..f45ff6b0f8 100644 --- a/support/docker/Dockerfile +++ b/support/docker/debian-bullseye/Dockerfile @@ -1,6 +1,6 @@ # This Dockerfile generates the docker image that gets used by Gitlab CI # To build it (YYYYMMDD.HHMM is the current date and time in UTC): -# docker build -t registry.gitlab.com/buildroot.org/buildroot/base:YYYYMMDD.HHMM support/docker +# docker build -t registry.gitlab.com/buildroot.org/buildroot/base:YYYYMMDD.HHMM support/docker/debian-stretch # docker push registry.gitlab.com/buildroot.org/buildroot/base:YYYYMMDD.HHMM # We use a specific tag for the base image *and* the corresponding date diff --git a/support/docker/apt-sources.list b/support/docker/debian-bullseye/apt-sources.list similarity index 100% rename from support/docker/apt-sources.list rename to support/docker/debian-bullseye/apt-sources.list From patchwork Sat Dec 16 16:09:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1876941 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Ssrfc3Tbmz23p3 for ; Sun, 17 Dec 2023 03:10:48 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 93F8E41761; Sat, 16 Dec 2023 16:10:46 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 93F8E41761 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3f976GdURARw; Sat, 16 Dec 2023 16:10:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id D1988417FC; Sat, 16 Dec 2023 16:10:44 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org D1988417FC X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id EEC1F1BF28A for ; Sat, 16 Dec 2023 16:10:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id D4EFB4177B for ; Sat, 16 Dec 2023 16:10:07 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org D4EFB4177B X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xnqC6Kr9jtI0 for ; Sat, 16 Dec 2023 16:10:07 +0000 (UTC) Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by smtp4.osuosl.org (Postfix) with ESMTPS id 0EE254175A for ; Sat, 16 Dec 2023 16:10:07 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 0EE254175A Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-40c2bb872e2so18676395e9.3 for ; Sat, 16 Dec 2023 08:10:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702743005; x=1703347805; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=0f8vHfSow3CM+vatuL8/KzJSK7T+qN+PX8WLWFWDQTc=; b=Huf/BDs5LwIOSIxt1tUcioxD8q45iOWDSujCjgAlB1/pg9nhWOyB+I7rkmXwvQWmq/ xnzCqJkiSTRnuUaJGMc7eoQ7OQjza3Qbgo8YT1e4pW04wo/IWMZ7uVeJV50mFd/rqUVB phWixMv581COhK/jp4VlCuf6PWDwJaGTX1M1MnTX2AZ1Lr1Ls+bxkrJ1VY0qqcXOjt+R V/PZ2fF5SimXXuDqebTUIT5LYSqBfedygeoFJnyKDYgrkKxLoXrSK3MAzm6WDkc0XW8e i/JOLZztzn8Umw+iBplQJEN76Ue2gqzehWxz0RBCLrozAJnrrVMWdR0ZGV5+YwuFnG7a /g2Q== X-Gm-Message-State: AOJu0YwC/oQ4MWOg5EXu4aSUSSWBGzUx3opy7G/FrIl2zKEk9MFYS9r0 nf7k31aWnK19M/4AeFEfdRt0FVjCJqs= X-Google-Smtp-Source: AGHT+IGhoEGcpI2IISRx9mEM5DXbd4FBNSOF5bTKjQtUcGJLhkzwUN58ptrjlV9uZp5NGEiSSuMryg== X-Received: by 2002:a05:600c:2108:b0:40c:31e5:49b6 with SMTP id u8-20020a05600c210800b0040c31e549b6mr3571284wml.283.1702743005126; Sat, 16 Dec 2023 08:10:05 -0800 (PST) Received: from landeda.home ([2a01:cb19:8290:3800:4f89:5708:1633:580e]) by smtp.gmail.com with ESMTPSA id k40-20020a05600c1ca800b0040b45356b72sm36319926wms.33.2023.12.16.08.10.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Dec 2023 08:10:04 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 16 Dec 2023 17:09:59 +0100 Message-ID: <2cb66b4764a0dc078a1d100bb2570e1be86381bb.1702742998.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702743005; x=1703347805; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=0f8vHfSow3CM+vatuL8/KzJSK7T+qN+PX8WLWFWDQTc=; b=bp/DELuFdSyHAN1eG+kmue06DG05lsUcEWbPYWD5H0Kkuz4gBafOtN5qdL7iSSUQiv 7qdldsZG1Y5wpRcDrscGGOSlBDwgcbC+lw9FDS/sdpLLqSeSRcEW6oddjC+pV2YcFiSJ wFyR5xCHfw7oQ1gjifgKL8uin+l8KudEjAFPNRB99FnVJDhUfC5rP1w1JYcYxFpwTBC4 QVillBYsH0nBPa6Q/pvLNaX93tiqyOw2Qsw5G3OfFUU59QBtgJi7YEeRFUu905/9tvo/ u7Z/VHHciEDokaaKjQ0qIGy0r0LAeglU1m3Qifis2Q+T2NE7xo+bjFYdTXBPBB73yrRG 5wAg== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=bp/DELuF Subject: [Buildroot] [PATCH 6/9] support/docker: add script to generate docker images X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Yann E. MORIN" , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Signed-off-by: "Yann E. MORIN" --- support/docker/build-all | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100755 support/docker/build-all diff --git a/support/docker/build-all b/support/docker/build-all new file mode 100755 index 0000000000..d5c01771cf --- /dev/null +++ b/support/docker/build-all @@ -0,0 +1,17 @@ +#!/bin/sh +set -e + +BR2_DOCKER_VERSION="${1}" + +if [ -z "${BR2_DOCKER_VERSION}" ]; then + printf 'Usage: %s VERSION\n' "${0}" + exit 1 +fi + +BASE_DIR="${0%/*}" +for context_dir in "${BASE_DIR}"/*/; do \ + distro="$(basename "${context_dir}")" + docker build \ + -t "buildroot/${distro}:${BR2_DOCKER_VERSION}" \ + "${context_dir}" +done From patchwork Sat Dec 16 16:10:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1876944 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SsrgM5qPlz23p3 for ; Sun, 17 Dec 2023 03:11:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id F211E60B92; Sat, 16 Dec 2023 16:11:24 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org F211E60B92 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FsQv0ZYjvyC8; Sat, 16 Dec 2023 16:11:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id E647560B99; Sat, 16 Dec 2023 16:11:22 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org E647560B99 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id D09641BF867 for ; Sat, 16 Dec 2023 16:10:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id A9B424175A for ; Sat, 16 Dec 2023 16:10:08 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org A9B424175A X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PtGJj4XBc2zN for ; Sat, 16 Dec 2023 16:10:07 +0000 (UTC) Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by smtp4.osuosl.org (Postfix) with ESMTPS id 81E9F41774 for ; Sat, 16 Dec 2023 16:10:07 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 81E9F41774 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-40c60dfa5bfso20044435e9.0 for ; Sat, 16 Dec 2023 08:10:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702743006; x=1703347806; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=BBwgxECHcJib0qmuLdOIlnLtf54IZrKWbLYtcnH6SW0=; b=MO0pAq4gZyD5nlhekzmfX7KHszmbVWr7MbOszSagH55sFqFJMAJExYuXTb5q8+DG8X 5kEGGot6wwLpI9Od42Vri/vj9cKHSM6MXFZHxj3U641MpZ5u/mL9oeg8FdW+jjHLSdSw pr2a30G6kNQ3fz5R6CxsFiG7VVqly8j6RWJc0IuGA3d1zobKF9PIzWIXlG4+mB89D59k XhqH3lm3MCEMs1FqwrK9GFTyxM2/EBpS0tUIvJD0wT3weGkNxYNmUbOeoVQY8UbLd9R8 ogL3CemykZ6LXKE5uQ5iOCsRaXN63GP7HTxHXC5PxfUQwEEGDhCxZjJJ/vAOoTtg6aPq XzFw== X-Gm-Message-State: AOJu0YxxaGLDpSFbKLy81c3+ATZfQG4cXWZ2Y0ZLPmVvHbOnauwD2OFp oxn5G16LZMAAloFOnC4nGxnfyr0fpcE= X-Google-Smtp-Source: AGHT+IEeE0onvoHi3try91/vwv78JFYLvXiwrelNumN93J2i1WQF3rhgOevciyGvK6/2WlZKohbA7w== X-Received: by 2002:a05:600c:2804:b0:40c:3eab:d987 with SMTP id m4-20020a05600c280400b0040c3eabd987mr6523483wmb.125.1702743005589; Sat, 16 Dec 2023 08:10:05 -0800 (PST) Received: from landeda.home ([2a01:cb19:8290:3800:4f89:5708:1633:580e]) by smtp.gmail.com with ESMTPSA id k40-20020a05600c1ca800b0040b45356b72sm36319926wms.33.2023.12.16.08.10.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Dec 2023 08:10:05 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 16 Dec 2023 17:10:00 +0100 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702743005; x=1703347805; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=BBwgxECHcJib0qmuLdOIlnLtf54IZrKWbLYtcnH6SW0=; b=PzuPnwNMSxCoUKYjk9kUzi/xvhB8DtB7jQMlwQ0OQWd1EECdzJn2ltmUPcSQXj40tn IQ8ogH15BifzHVnvHy33QP0WQw3bCPHm6jGm1Iu35fhsMTaGf8M0oBVCDc1UgCdKCHz0 bwYy3qAjc3TprrL2qLluhye6H1+2AKVlHJXYCpncodqeG/p2vKKYNMG4EPY+6ewGux/T GJOLrADylQswPTh5ukdq6N+FRfeSDXQvj2Df2pVSX/NxKyJhBw+vVHlHxbYN+szAEOcP 8NyHj0/X6F1a/6R+33XXcJIQd+UiaOtC+LSOk462uNuN8B6yqJZQ20tyPB0NCwk8azQ6 fQ5Q== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=PzuPnwNM Subject: [Buildroot] [PATCH 7/9] support/docker: split base image into three X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Yann E. MORIN" , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Our basic image should have only what is strictly required to do the build, i.e. only the packages listed as mandatory in the manual. Then we need an image for running our CI, with a few additional toolings. Finally, we want an image that users can run to use Buildroot (not to develop on Buildroot, but just to use it). Signed-off-by: Yann E. MORIN --- support/docker/base | 1 - support/docker/build-all | 31 +++++++++---- .../Dockerfile | 28 ++---------- .../apt-sources.list | 0 support/docker/debian-bullseye.ci/Dockerfile | 43 +++++++++++++++++++ .../docker/debian-bullseye.user/Dockerfile | 32 ++++++++++++++ 6 files changed, 101 insertions(+), 34 deletions(-) delete mode 120000 support/docker/base rename support/docker/{debian-bullseye => debian-bullseye.base}/Dockerfile (59%) rename support/docker/{debian-bullseye => debian-bullseye.base}/apt-sources.list (100%) create mode 100644 support/docker/debian-bullseye.ci/Dockerfile create mode 100644 support/docker/debian-bullseye.user/Dockerfile diff --git a/support/docker/base b/support/docker/base deleted file mode 120000 index 95f9ccb9fc..0000000000 --- a/support/docker/base +++ /dev/null @@ -1 +0,0 @@ -debian-bullseye \ No newline at end of file diff --git a/support/docker/build-all b/support/docker/build-all index d5c01771cf..6ae4ba5d25 100755 --- a/support/docker/build-all +++ b/support/docker/build-all @@ -2,16 +2,31 @@ set -e BR2_DOCKER_VERSION="${1}" +BR2_REGISTRY="${2:-registry.gitlab.com/buildroot.org/}" -if [ -z "${BR2_DOCKER_VERSION}" ]; then - printf 'Usage: %s VERSION\n' "${0}" +case "${BR2_DOCKER_VERSION}" in + (""|*/*) + printf 'Usage: %s VERSION [REGSITRY]\n' "${0}" exit 1 -fi + ;; +esac +case "${BR2_REGISTRY}" in + (""|*/) ;; + (*) BR2_REGISTRY="${BR2_REGISTRY}/";; +esac BASE_DIR="${0%/*}" -for context_dir in "${BASE_DIR}"/*/; do \ - distro="$(basename "${context_dir}")" - docker build \ - -t "buildroot/${distro}:${BR2_DOCKER_VERSION}" \ - "${context_dir}" +# "ci" images use FROM on the "base" images, so need to ensure we build +# the "base" images first (don't rely on alphabetical ordering!). Ditto, +# the 'user' images are based on the 'ci' ones. +for type in base ci user; do + for context_dir in "${BASE_DIR}"/*."${type}"/; do \ + [ -e "${context_dir}" ] || continue + distro="$(basename "${context_dir}")" + docker build \ + --build-arg BR2_REGISTRY="${BR2_REGISTRY}" \ + --build-arg BR2_DOCKER_VERSION="${BR2_DOCKER_VERSION}" \ + -t "${BR2_REGISTRY}buildroot/${distro}:${BR2_DOCKER_VERSION}" \ + "${context_dir}" + done done diff --git a/support/docker/debian-bullseye/Dockerfile b/support/docker/debian-bullseye.base/Dockerfile similarity index 59% rename from support/docker/debian-bullseye/Dockerfile rename to support/docker/debian-bullseye.base/Dockerfile index f45ff6b0f8..a3e90a79ab 100644 --- a/support/docker/debian-bullseye/Dockerfile +++ b/support/docker/debian-bullseye.base/Dockerfile @@ -1,7 +1,5 @@ -# This Dockerfile generates the docker image that gets used by Gitlab CI -# To build it (YYYYMMDD.HHMM is the current date and time in UTC): -# docker build -t registry.gitlab.com/buildroot.org/buildroot/base:YYYYMMDD.HHMM support/docker/debian-stretch -# docker push registry.gitlab.com/buildroot.org/buildroot/base:YYYYMMDD.HHMM +# vi: ft=dockerfile +# Debian-based minimal image with only mandatory packages # We use a specific tag for the base image *and* the corresponding date # for the repository., so do not forget to update the apt-sources.list @@ -24,32 +22,14 @@ RUN dpkg --add-architecture i386 && \ RUN apt-get -o APT::Retries=5 install -y --no-install-recommends \ bc \ build-essential \ - bzr \ ca-certificates \ - cmake \ cpio \ - cvs \ file \ g++-multilib \ git \ libc6:i386 \ - libncurses5-dev \ locales \ - mercurial \ - openssh-server \ - python3 \ - python3-flake8 \ - python3-magic \ - python3-nose2 \ - python3-pexpect \ - python3-pytest \ - qemu-system-arm \ - qemu-system-misc \ - qemu-system-x86 \ rsync \ - shellcheck \ - subversion \ - sudo \ unzip \ wget \ && \ @@ -61,9 +41,7 @@ RUN sed -i 's/# \(en_US.UTF-8\)/\1/' /etc/locale.gen && \ /usr/sbin/locale-gen RUN useradd -ms /bin/bash br-user && \ - chown -R br-user:br-user /home/br-user && \ - printf 'br-user ALL=NOPASSWD: /bin/su -\n' >/etc/sudoers.d/br-user && \ - chmod 0440 /etc/sudoers.d/br-user + chown -R br-user:br-user /home/br-user USER br-user WORKDIR /home/br-user diff --git a/support/docker/debian-bullseye/apt-sources.list b/support/docker/debian-bullseye.base/apt-sources.list similarity index 100% rename from support/docker/debian-bullseye/apt-sources.list rename to support/docker/debian-bullseye.base/apt-sources.list diff --git a/support/docker/debian-bullseye.ci/Dockerfile b/support/docker/debian-bullseye.ci/Dockerfile new file mode 100644 index 0000000000..06db62e11f --- /dev/null +++ b/support/docker/debian-bullseye.ci/Dockerfile @@ -0,0 +1,43 @@ +# This Dockerfile generates the docker image that gets used by Gitlab CI +# To build it (YYYYMMDD.HHMM is the current date and time in UTC): +# docker build -t registry.gitlab.com/buildroot.org/buildroot/base:YYYYMMDD.HHMM support/docker/debian-stretch +# docker push registry.gitlab.com/buildroot.org/buildroot/base:YYYYMMDD.HHMM + +# Based on our reference build image +ARG BR2_REGISTRY +ARG BR2_DOCKER_VERSION +FROM ${BR2_REGISTRY}buildroot/debian-bullseye.base:${BR2_DOCKER_VERSION} + +LABEL maintainer="Buildroot mailing list " \ + vendor="Buildroot" \ +description="Container with everything needed to run Buildroot" + +USER root +WORKDIR /root +ENV HOME /root + +RUN apt-get -o APT::Retries=5 install -y --no-install-recommends \ + bzr \ + cmake \ + cvs \ + mercurial \ + openssh-server \ + python3 \ + python3-flake8 \ + python3-magic \ + python3-nose2 \ + python3-pexpect \ + python3-pytest \ + qemu-system-arm \ + qemu-system-misc \ + qemu-system-x86 \ + shellcheck \ + subversion \ + && \ + apt-get -y autoremove && \ + apt-get -y clean + +USER br-user +WORKDIR /home/br-user +ENV HOME /home/br-user +ENV LC_ALL en_US.UTF-8 diff --git a/support/docker/debian-bullseye.user/Dockerfile b/support/docker/debian-bullseye.user/Dockerfile new file mode 100644 index 0000000000..72f807b2d5 --- /dev/null +++ b/support/docker/debian-bullseye.user/Dockerfile @@ -0,0 +1,32 @@ +# This Dockerfile generates the docker image that can be used by users +# to get a workign build environment +# To build it (YYYYMMDD.HHMM is the current date and time in UTC): +# docker build -t registry.gitlab.com/buildroot.org/buildroot/base:YYYYMMDD.HHMM support/docker/debian-stretch +# docker push registry.gitlab.com/buildroot.org/buildroot/base:YYYYMMDD.HHMM + +# Based on our reference build image +ARG BR2_REGISTRY +ARG BR2_DOCKER_VERSION +FROM ${BR2_REGISTRY}buildroot/debian-bullseye.ci:${BR2_DOCKER_VERSION} + +LABEL maintainer="Buildroot mailing list " \ + vendor="Buildroot" \ +description="Container with everything needed to run Buildroot" + +USER root +WORKDIR /root +ENV HOME /root + +RUN apt-get -o APT::Retries=5 install -y --no-install-recommends \ + libncurses5-dev \ + sudo \ + && \ + apt-get -y autoremove && \ + apt-get -y clean && \ + printf 'br-user ALL=NOPASSWD: /bin/su -\n' >/etc/sudoers.d/br-user && \ + chmod 0440 /etc/sudoers.d/br-user + +USER br-user +WORKDIR /home/br-user +ENV HOME /home/br-user +ENV LC_ALL en_US.UTF-8 From patchwork Sat Dec 16 16:10:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1876945 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Ssrgb5Dt2z23p3 for ; Sun, 17 Dec 2023 03:11:39 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 9DCC760F5F; Sat, 16 Dec 2023 16:11:37 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 9DCC760F5F X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mpyNT_SVna_B; Sat, 16 Dec 2023 16:11:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 967B860BC8; Sat, 16 Dec 2023 16:11:35 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 967B860BC8 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 240911BF28A for ; Sat, 16 Dec 2023 16:10:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id F022881F39 for ; Sat, 16 Dec 2023 16:10:08 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org F022881F39 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id I5LgEYVt2dqC for ; Sat, 16 Dec 2023 16:10:08 +0000 (UTC) Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by smtp1.osuosl.org (Postfix) with ESMTPS id E88CC81ED7 for ; Sat, 16 Dec 2023 16:10:07 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org E88CC81ED7 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-40c48d7a7a7so16252465e9.3 for ; Sat, 16 Dec 2023 08:10:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702743006; x=1703347806; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=p1mE0tVQ7Tu70XpInl+swni2s6TGtEyUDYXsiGXnhXI=; b=qSUQD3xV1DdGjKDzDVpX7hlc6NCZ64LmxeKGwtexdlGgFQH9dKKsLWvUlzRxO6wOQE 0rILElwlTfSBE3XlFAbyjR+GDFop7oJyVhhOAcAQYOuuZaT60jLqv7lxd1zC2rP5/TL9 Mlmr9WbnwlJ4Cve+V3Bo9TaKeE9lEbHTI8F5nJgeH3zQ9wWxQbVBf7+djAv57lCVoisg xt4bb+O7yjGKpCjqfiDQ7hw7SYdxkWNUQOQKpSvmjlqX5hn6izjtBMWXx+MDvIylcDr2 9FWii8HpYxgGi+7pA+JDF2j9ly+/lbjVM/Yxs7g0E/3FJTnOP8wgOMdHpLEKAZ4maNQq 9J3A== X-Gm-Message-State: AOJu0Yxb5ETpBRn3BvtGIC82t86oh6bL2v/HybbwRD7pjzDDETVT2KdU 6/H9xwg37wqhuqhDm5du0K6Jg3kj/uk= X-Google-Smtp-Source: AGHT+IHfKUgj1L75tY2RDd67tHQ7uXk5ayAicGzFslS90Lpv7y1St6hcFh5P2qs+62hqh0zyFB4NYQ== X-Received: by 2002:a7b:c84e:0:b0:40c:25e8:70bf with SMTP id c14-20020a7bc84e000000b0040c25e870bfmr8001248wml.110.1702743006049; Sat, 16 Dec 2023 08:10:06 -0800 (PST) Received: from landeda.home ([2a01:cb19:8290:3800:4f89:5708:1633:580e]) by smtp.gmail.com with ESMTPSA id k40-20020a05600c1ca800b0040b45356b72sm36319926wms.33.2023.12.16.08.10.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Dec 2023 08:10:05 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 16 Dec 2023 17:10:01 +0100 Message-ID: <7d90c305cd781885c4161e630f34ef8417fe2b7a.1702742998.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702743006; x=1703347806; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=p1mE0tVQ7Tu70XpInl+swni2s6TGtEyUDYXsiGXnhXI=; b=nU/okhXTF9GF2mTGFodHA+qtYGCVFQIAxA3jEDBCx0uVkhlbnp7jXzSkND7oxkSrTE t7nmUW24Z/rBMUNoMfSpJuL9oSxgNaUZWNhaPb8y4VcA6pofTNaBWqeVOBWIZ1iwPfAZ bNfVCVGu27e4Y4L4E5p/Kf6D/VuaV+GlQl0H9myRAyj7Qw+/LpOkkt8B/XUAzuzu0ibU O66MYxbA/O+n9q7mxgju9drDou5pQ7epXF8kh4SRwy9K6PkCyzMXULnlKTRHPYxBn2Fe SbcctvN8b3UXySWFtyhzzNPBqeLXXPeXoDlItFfM174txjJyz1imF32KUeQAbQdWrvt4 mYqQ== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=nU/okhXT Subject: [Buildroot] [PATCH 8/9] docs/manual: add section about docker images X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Yann E. MORIN" , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Signed-off-by: Yann E. MORIN --- docs/manual/prerequisite.adoc | 43 +++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/docs/manual/prerequisite.adoc b/docs/manual/prerequisite.adoc index 6f07cba551..d15f0a972a 100644 --- a/docs/manual/prerequisite.adoc +++ b/docs/manual/prerequisite.adoc @@ -96,3 +96,46 @@ corresponding tool on the host system: * Graph generation tools: ** +graphviz+ to use 'graph-depends' and '-graph-depends' ** +python-matplotlib+ to use 'graph-build' + + +=== Docker images + +The Buildroot project also provides a set of Docker images descriptions, +in the directory `support/docker/`, which provide ready to use systems +for using Buildroot. Those images are available on the +https://gitlab.com/buildroot.org/buildroot/container_registry[docker +registry of the Buildroot project]. + +For a given distribution, and a given version of that distribution, +there are up to three variants: 'base', 'ci', and 'user': + +* the 'base' variant is a minimalist system, which contains only the + minimal set of packages required for running Buildroot (i.e. the + packages listed as mandatory in the manual). The 'base' image shall + be used to verify that a package has all its dependencies defined, + for example by using: + +** `utils/test-pkg` + +* the 'ci' image inherits from the 'base' one, and adds the few packages + that are needed to run the CI jobs. The 'ci' image shall be used to + run the various tests and tooling in Buildroot: + +** `make check-package` +** `support/testing/run-tests` +** `utils/check-symbols` + +* the 'user' image inherits from the 'ci' image, and adds a few more + packages and setup that are useful for interactive use (e.g. the + `br-user` is sudoer without any password, but can just run a login + shell, using _exactly_ `sudo su -`). + +The Buildroot developers by no mean enforce or recommend using those +images, or even suggest that Buildroot only works when using one of +those images; instead, they are known-working environments that can be +used where the distribution on the build machine can't be configured +to match Buildroot's needs (e.g. on a shared server), or to provide a +quick and easy way to test on various ditributions. + +Finally, those images can serve as the basis for further customisation: +one can use them in the `FROM` directive in their own +Dockerfile+. From patchwork Sat Dec 16 16:10:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1876947 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SsrhK2pxcz23p3 for ; Sun, 17 Dec 2023 03:12:17 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 92B9760F99; Sat, 16 Dec 2023 16:12:15 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 92B9760F99 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id w2FwZDZMFrAs; Sat, 16 Dec 2023 16:12:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 22FF160F5F; Sat, 16 Dec 2023 16:12:13 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 22FF160F5F X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 108711BF28A for ; Sat, 16 Dec 2023 16:10:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id EAF4D41761 for ; Sat, 16 Dec 2023 16:10:09 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org EAF4D41761 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2zvuRTHr3chi for ; Sat, 16 Dec 2023 16:10:08 +0000 (UTC) Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by smtp4.osuosl.org (Postfix) with ESMTPS id AE6774177B for ; Sat, 16 Dec 2023 16:10:08 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org AE6774177B Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-40c3fe6c1b5so18046855e9.2 for ; Sat, 16 Dec 2023 08:10:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702743007; x=1703347807; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=fQuP/A1KXT2y+uEeJW3VswSpdAnzYi0AM+MPsmKkSY4=; b=NCbjUZFaNXyL354jJdmwpkgUAIVFUb3/exMd+6lWtvRFBiu0y1jjsndwMF7wFq4RIY JrJMe0mOlEqX03EO2/nh7yx9aonykekF2cEX96c1w0Ku6SNsXKqqqv4jUYOWWGmVr7kE xjuZZPI0BOVWFTC28fkXb2C30FiEu3eo31MYg4tAiyU5lAx8byzRtYApOmvDj02xxOVa iFIeMnTCoW7618+bAMMD7JiWIaZ0UJKC9bXDlzF0KDmqI+IL5VrZkFXGu5P5DEPrWg4V 9/1OdUz+FGmf/W+HM2XfWvVNoNMhrvu2paK0BTBQCGPcHDSJsQGadH40qUUFRUQag+1F E43g== X-Gm-Message-State: AOJu0Yw5NnoA5IETf1ekephabFyyxn9uba7CeFyOO+wjIEipiZqWWA/n tGRrFbfy0SpqZeymVE+m5/HNMsm36Ys= X-Google-Smtp-Source: AGHT+IFqo8o26UP5cSIsPtdwvKijEOGuUh4XumlDs1ObdBP0QZdyA9CYwdbcDYQzk6St7X3FbdYyTg== X-Received: by 2002:a7b:c849:0:b0:40b:3d9f:eedf with SMTP id c9-20020a7bc849000000b0040b3d9feedfmr7203467wml.15.1702743006601; Sat, 16 Dec 2023 08:10:06 -0800 (PST) Received: from landeda.home ([2a01:cb19:8290:3800:4f89:5708:1633:580e]) by smtp.gmail.com with ESMTPSA id k40-20020a05600c1ca800b0040b45356b72sm36319926wms.33.2023.12.16.08.10.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Dec 2023 08:10:06 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 16 Dec 2023 17:10:02 +0100 Message-ID: <667bcfe54dc93243aaf66e414bcb60583f5a97d7.1702742998.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702743007; x=1703347807; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=fQuP/A1KXT2y+uEeJW3VswSpdAnzYi0AM+MPsmKkSY4=; b=jZ4zl2fJe7F4YrqxqLXqUGF0G13Yp3cbsJmU0UV03RQe64GjOlTYwsMNwtGCGrHKw0 6nayFN1cOgBST3Gj2TITqkwSHOP3+95AFZPqgulqpZf2c8c0Ywp4qFicKhUYIQRXFv+e N3kMo8Jyn6hFMUE5KrCNfXbqnvxIS45z5ithU8PyJwu3P0Zu8UIjMYbyXvivwBNVeVan vtdRnVZVH/H/nFV24WThWgrM3qD8OHx7TkyQ58afGylf7FIrfpp/EnILxPNyWgECd5ye rHGj7f/ceHAsxoYKBNscOrBuVCn+uSwiOJqWzRs1hvQKgfYpde50jqBO0oeX8eqpr++v y9Mw== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=jZ4zl2fJ Subject: [Buildroot] [PATCH 9/9] support/docker: add a Fedora-38-based image X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Yann E. MORIN" , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Unlink Debian, Fedora does not provide any time-based snapshots that would provide a reproducible distribution. However, it looks like the "main" repository does not change after the release, with updates going into the aptly named "updates" repository. So, in order to be as reproducible as possible, we remove all non-main repositories, which also means no so-called modularity (but it's been dropped upstream anyway [0]), and no h264 decoder from Cisco (but we don;t need that for a Buildroot build image). [0] https://fedoraproject.org/wiki/Changes/RetireModularity Signed-off-by: "Yann E. MORIN" --- support/docker/fedora-38.base/Dockerfile | 43 ++++++++++++++++++++++ support/docker/fedora-38.ci/Dockerfile | 47 ++++++++++++++++++++++++ support/docker/fedora-38.user/Dockerfile | 35 ++++++++++++++++++ 3 files changed, 125 insertions(+) create mode 100644 support/docker/fedora-38.base/Dockerfile create mode 100644 support/docker/fedora-38.ci/Dockerfile create mode 100644 support/docker/fedora-38.user/Dockerfile diff --git a/support/docker/fedora-38.base/Dockerfile b/support/docker/fedora-38.base/Dockerfile new file mode 100644 index 0000000000..e48a621103 --- /dev/null +++ b/support/docker/fedora-38.base/Dockerfile @@ -0,0 +1,43 @@ +# vi: ft=dockerfile +# Note: this dockerfile is not reproducible: even if we pin the image +# to a specific tag and hash, the repository where we fetch packages +# from is not pinned to a specific point in time; i.e. we'll get +# whatever is current at the moment we build. + +FROM fedora:38@sha256:e9b68b3351329d72df54dfa5d10b2310e10829f6af58a8c30e0fc612d4f3b749 + +LABEL maintainer="Buildroot mailing list " \ + vendor="Buildroot" \ + description="Container based on Fedora 38, with everything needed to run Buildroot already installed" + +# Only keep the main repository, so we only get packages as they were +# at the time of release, and we get no update: this helps a bit with +# reproducibility. +RUN rm -f /etc/yum.repos.d/fedora-*.repo && \ + dnf -y install \ + @development-tools \ + bc \ + bzip2 \ + cpio \ + file \ + gcc-c++ \ + git \ + perl-English \ + perl-ExtUtils-MakeMaker \ + perl-FindBin \ + perl-IPC-Cmd \ + perl-Thread-Queue \ + rsync \ + unzip \ + wget \ + which \ + && \ + dnf -y clean all + +RUN useradd -ms /bin/bash br-user && \ + chown -R br-user:br-user /home/br-user + +USER br-user +WORKDIR /home/br-user +ENV HOME /home/br-user +ENV LC_ALL C.utf8 diff --git a/support/docker/fedora-38.ci/Dockerfile b/support/docker/fedora-38.ci/Dockerfile new file mode 100644 index 0000000000..b136970502 --- /dev/null +++ b/support/docker/fedora-38.ci/Dockerfile @@ -0,0 +1,47 @@ +# vi: ft=dockerfile +# Note: this dockerfile is not reproducible: even if we pin the image +# to a specific tag and hash, the repository where we fetch packages +# from is not pinned to a specific point in time; i.e. we'll get +# whatever is current at the moment we build. + +# Based on our reference build image +ARG BR2_REGISTRY +ARG BR2_DOCKER_VERSION +FROM ${BR2_REGISTRY}buildroot/fedora-38.base:${BR2_DOCKER_VERSION} + +LABEL maintainer="Buildroot mailing list " \ + vendor="Buildroot" \ + description="Container based on Fedora 38, with everything needed to run Buildroot already installed" + +USER root +WORKDIR /root +ENV HOME /root + +# Only keep the main repository, so we only get packages as they were +# at the time of release, and we get no update: this helps a bit with +# reproducibility. +RUN rm -f /etc/yum.repos.d/fedora-*.repo && \ + dnf -y install \ + breezy \ + cmake \ + cvs \ + mercurial \ + openssh-server \ + python3 \ + python3-flake8 \ + python3-magic \ + python3-nose2 \ + python3-pexpect \ + python3-pytest \ + qemu-system-arm \ + qemu-system-riscv \ + qemu-system-x86 \ + shellcheck \ + subversion \ + && \ + dnf -y clean all + +USER br-user +WORKDIR /home/br-user +ENV HOME /home/br-user +ENV LC_ALL C.utf8 diff --git a/support/docker/fedora-38.user/Dockerfile b/support/docker/fedora-38.user/Dockerfile new file mode 100644 index 0000000000..fd0ebccade --- /dev/null +++ b/support/docker/fedora-38.user/Dockerfile @@ -0,0 +1,35 @@ +# vi: ft=dockerfile +# Note: this dockerfile is not reproducible: even if we pin the image +# to a specific tag and hash, the repository where we fetch packages +# from is not pinned to a specific point in time; i.e. we'll get +# whatever is current at the moment we build. + +# Based on our reference build image +ARG BR2_REGISTRY +ARG BR2_DOCKER_VERSION +FROM ${BR2_REGISTRY}buildroot/fedora-38.ci:${BR2_DOCKER_VERSION} + +LABEL maintainer="Buildroot mailing list " \ + vendor="Buildroot" \ + description="Container based on Fedora 38, with everything needed to run Buildroot already installed" + +USER root +WORKDIR /root +ENV HOME /root + +# Only keep the main repository, so we only get packages as they were +# at the time of release, and we get no update: this helps a bit with +# reproducibility. +RUN rm -f /etc/yum.repos.d/fedora-*.repo && \ + dnf -y install \ + ncurses-devel \ + sudo \ + && \ + dnf -y clean all && \ + printf 'br-user ALL=NOPASSWD: /usr/bin/su -\n' >/etc/sudoers.d/br-user && \ + chmod 0440 /etc/sudoers.d/br-user + +USER br-user +WORKDIR /home/br-user +ENV HOME /home/br-user +ENV LC_ALL C.utf8