[7/7,releng] Add cpio to dependencies

Message ID 20190907112240.1028433-8-git@esotericnonsense.com
State New
Headers show
Series
  • Making archiso deterministic
Related show

Commit Message

Daniel Edgecumbe Sept. 7, 2019, 11:22 a.m. UTC
This is an optional dependency of mkinitcpio, required in the case
we're using where SOURCE_DATE_EPOCH may be relevant.

Signed-off-by: Daniel Edgecumbe <git@esotericnonsense.com>
---
 configs/releng/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Daniel Edgecumbe Sept. 9, 2019, 8:22 p.m. UTC | #1
Note that this final patch is no longer necessary as the latest
reproducibility PR on mkinitcpio works with libarchive.

On 07/09/2019 13.22, Daniel Edgecumbe wrote:
> This is an optional dependency of mkinitcpio, required in the case
> we're using where SOURCE_DATE_EPOCH may be relevant.
> 
> Signed-off-by: Daniel Edgecumbe <git@esotericnonsense.com>
> ---
>  configs/releng/build.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configs/releng/build.sh b/configs/releng/build.sh
> index 273b501..836a821 100755
> --- a/configs/releng/build.sh
> +++ b/configs/releng/build.sh
> @@ -64,7 +64,7 @@ make_pacman_conf() {
>  # Base installation, plus needed packages (airootfs)
>  make_basefs() {
>      mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" init
> -    mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "haveged intel-ucode amd-ucode memtest86+ mkinitcpio-nfs-utils nbd zsh efitools" install
> +    mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "haveged intel-ucode amd-ucode memtest86+ mkinitcpio-nfs-utils nbd zsh efitools cpio" install
>  }
>  
>  # Additional packages (airootfs)
>

Patch

diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 273b501..836a821 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -64,7 +64,7 @@  make_pacman_conf() {
 # Base installation, plus needed packages (airootfs)
 make_basefs() {
     mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" init
-    mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "haveged intel-ucode amd-ucode memtest86+ mkinitcpio-nfs-utils nbd zsh efitools" install
+    mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "haveged intel-ucode amd-ucode memtest86+ mkinitcpio-nfs-utils nbd zsh efitools cpio" install
 }
 
 # Additional packages (airootfs)