Switch checksums from MD5 to BLAKE2

[people/pmueller/ipfire-2.x.git] / lfs / stage2

diff --git a/lfs/stage2 b/lfs/stage2
index 2863d6b697590bce5e6755302412af0df646e3b6..9f93babe2f046e718d90fa12e765048935b2f1ee 100644 (file)
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -39,7 +39,7 @@ check :
 
 download :
 
-md5 :
+b2 :
 
 ###############################################################################
 # Installation Details
@@ -53,7 +53,7 @@ $(TARGET) :
        -mkdir -pv /{media/{floppy,cdrom,usbkey},sbin,srv,var}
        -install -dv -m 0750 /root
        -install -dv -m 1777 /tmp /var/tmp
-       -mkdir -pv /usr/{,local/}{bin,include,lib{,/sse2},sbin,src}
+       -mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src}
        -mkdir -pv /usr/{,local/}share/{doc,info,locale,man}
        -mkdir -v  /usr/{,local/}share/{misc,terminfo,xt_geoip,zoneinfo}
        -mkdir -pv /usr/{,local/}share/man/man{1..8}
@@ -69,6 +69,11 @@ ifeq "$(IS_64BIT)" "1"
        ln -svf lib /usr/lib64
 endif
 
+ifeq "$(BUILD_ARCH)" "riscv64"
+       ln -svf . /lib/lp64d
+       ln -svf . /usr/lib/lp64d
+endif
+
        # Symlinks
        # for this reason, stage2 rebuild will broke the iso:perl, grubbatch
        -ln -sv $(TOOLS_DIR)/bin/{bash,cat,echo,pwd,stty} /bin
@@ -80,11 +85,13 @@ endif
 
        # Config files
        cp -rvf $(DIR_SRC)/config/etc/* /etc;
+       [ ! -d "$(DIR_SRC)/config/etc-$(BUILD_ARCH)" ] || cp -rvf $(DIR_SRC)/config/etc-$(BUILD_ARCH)/* /etc
        cp -rvf $(DIR_SRC)/config/lib/* /lib;
        touch /etc/{fs,m}tab
        echo "$(NAME) v$(VERSION) - $(SLOGAN)" >  /etc/issue
        echo "===============================" >> /etc/issue
        echo "\n running on \s \r \m"          >> /etc/issue
+       -cat /etc/motd >> /etc/issue
 
        # Bash startup files
        install --directory --mode=0755 --owner=root --group=root /etc/profile.d
@@ -106,10 +113,8 @@ endif
 
        # Move script to correct place.
        mv -vf /usr/local/bin/openvpn-metrics /usr/sbin/
-       mv -vf /usr/local/bin/ovpn-ccd-convert /usr/sbin/
-       mv -vf /usr/local/bin/ovpn-collectd-convert /usr/sbin/
        mv -vf /usr/local/bin/captive-cleanup /usr/bin/
-       
+
        # Install firewall scripts.
        mkdir -pv /usr/lib/firewall
        install -m 755 $(DIR_SRC)/config/firewall/rules.pl \
@@ -125,7 +130,7 @@ endif
 
        # Create /var dirs and files
        -mkdir -v /var/{lock,log,mail,spool,empty}
-       -mkdir -pv /var/{opt,cache,lib/{misc,locate},local}
+       -mkdir -pv /var/{opt,cache,lib/misc,local}
        -mkdir -pv /var/log/{counter,calamaris}
        chown nobody.nobody /var/log/calamaris
        touch /var/log/{btmp,lastlog,wtmp}
@@ -135,7 +140,7 @@ endif
 
        # Permissions
        chmod 0711 /var/empty
-       
+
        # A small hack to include /root to the iso but not all of it's files.
        touch /root/ipfire