[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c67ff7d72c2232b6994e1ff97277d4040711f97d

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c67ff7d72c2232b6994e1ff97277d4040711f97d

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 4745 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  c67ff7d72c2232b6994e1ff97277d4040711f97d (commit)
       via  f8a54e19617bdad48e390924547732386ce4d04a (commit)
       via  5a918d828f8a7ae3471ab6ca678ba634470917cd (commit)
      from  bef8b9c027b830f5b984cd33ffe4b681f37fbe7c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c67ff7d72c2232b6994e1ff97277d4040711f97d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Aug 18 10:13:01 2020 +0000

    zstd: Make this part of the core distributions
    
    Many packages link against it and we should make use of it
    when we have it.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit f8a54e19617bdad48e390924547732386ce4d04a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Aug 18 10:11:33 2020 +0000

    qemu: Update rootfile
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 5a918d828f8a7ae3471ab6ca678ba634470917cd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Aug 18 10:10:13 2020 +0000

    rsync: Update rootfile
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/{packages => common}/zstd | 0
 config/rootfiles/packages/qemu             | 3 +--
 config/rootfiles/packages/rsync            | 2 ++
 lfs/rsync                                  | 2 +-
 lfs/zstd                                   | 4 ----
 make.sh                                    | 2 +-
 6 files changed, 5 insertions(+), 8 deletions(-)
 rename config/rootfiles/{packages => common}/zstd (100%)

Difference in files:
diff --git a/config/rootfiles/packages/zstd b/config/rootfiles/common/zstd
similarity index 100%
rename from config/rootfiles/packages/zstd
rename to config/rootfiles/common/zstd
diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu
index 60ee05c55..21ae286e8 100644
--- a/config/rootfiles/packages/qemu
+++ b/config/rootfiles/packages/qemu
@@ -124,14 +124,13 @@ usr/share/qemu/multiboot.bin
 #usr/share/qemu/openbios-ppc
 #usr/share/qemu/openbios-sparc32
 #usr/share/qemu/openbios-sparc64
-+usr/share/qemu/opensbi-riscv32-sifive_u-fw_jump.bin
+#usr/share/qemu/opensbi-riscv32-sifive_u-fw_jump.bin
 #usr/share/qemu/opensbi-riscv32-virt-fw_jump.bin
 #usr/share/qemu/opensbi-riscv64-sifive_u-fw_jump.bin
 #usr/share/qemu/opensbi-riscv64-virt-fw_jump.bin
 #usr/share/qemu/palcode-clipper
 #usr/share/qemu/petalogix-ml605.dtb
 #usr/share/qemu/petalogix-s3adsp1800.dtb
-#usr/share/qemu/ppc_rom.bin
 usr/share/qemu/pvh.bin
 usr/share/qemu/pxe-e1000.rom
 usr/share/qemu/pxe-eepro100.rom
diff --git a/config/rootfiles/packages/rsync b/config/rootfiles/packages/rsync
index 59c8be9f1..70bb401fe 100644
--- a/config/rootfiles/packages/rsync
+++ b/config/rootfiles/packages/rsync
@@ -1,3 +1,5 @@
 usr/bin/rsync
+usr/bin/rsync-ssl
+#usr/share/man/man1/rsync-ssl.1
 #usr/share/man/man1/rsync.1
 #usr/share/man/man5/rsyncd.conf.5
diff --git a/lfs/rsync b/lfs/rsync
index 46da6075b..092b0187b 100644
--- a/lfs/rsync
+++ b/lfs/rsync
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = rsync
 PAK_VER    = 12
 
-DEPS       = zstd
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/zstd b/lfs/zstd
index 55ac837d3..c6af0f129 100644
--- a/lfs/zstd
+++ b/lfs/zstd
@@ -31,10 +31,6 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = zstd
-PAK_VER    = 1
-
-DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/make.sh b/make.sh
index 1d6e3c390..2a6198e05 100755
--- a/make.sh
+++ b/make.sh
@@ -1383,6 +1383,7 @@ buildipfire() {
   lfsmake2 spandsp
   lfsmake2 lz4
   lfsmake2 lzo
+  lfsmake2 zstd
   lfsmake2 openvpn
   lfsmake2 mpage
   lfsmake2 dbus
@@ -1433,7 +1434,6 @@ buildipfire() {
   lfsmake2 xvid
   lfsmake2 libmpeg2
   lfsmake2 gnump3d
-  lfsmake2 zstd
   lfsmake2 rsync
   lfsmake2 rpcbind
   lfsmake2 keyutils


hooks/post-receive
--
IPFire 2.x development tree