Install sysctl.conf only on those architectures where needed

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/etc/sysctl-aarch64.conf b/config/etc-aarch64/sysctl-aarch64.conf
similarity index 100%
rename from config/etc/sysctl-aarch64.conf
rename to config/etc-aarch64/sysctl-aarch64.conf

diff --git a/config/etc/sysctl-armv5tel.conf b/config/etc-armv5tel/sysctl-armv5tel.conf
similarity index 100%
rename from config/etc/sysctl-armv5tel.conf
rename to config/etc-armv5tel/sysctl-armv5tel.conf

diff --git a/config/etc/sysctl-x86_64.conf b/config/etc-x86_64/sysctl-x86_64.conf
similarity index 100%
rename from config/etc/sysctl-x86_64.conf
rename to config/etc-x86_64/sysctl-x86_64.conf

diff --git a/config/rootfiles/common/aarch64/stage2 b/config/rootfiles/common/aarch64/stage2
index 1db148203ba003ffb6b17d2fc33e7fed4b5c4b3a..59d85aabcbc199a34ba77375bd1f45f6128eb48c 100644 (file)
--- a/config/rootfiles/common/aarch64/stage2
+++ b/config/rootfiles/common/aarch64/stage2
@@ -42,7 +42,7 @@ etc/profile.d/term256.sh
 etc/profile.d/umask.sh
 etc/resolv.conf
 etc/securetty
-#etc/sysctl-x86_64.conf
+etc/sysctl-aarch64.conf
 etc/sysctl.conf
 etc/syslog.conf
 etc/system-release

diff --git a/config/rootfiles/common/armv5tel/stage2 b/config/rootfiles/common/armv5tel/stage2
new file mode 100644 (file)
index 0000000..9eebe60
--- /dev/null
+++ b/config/rootfiles/common/armv5tel/stage2
@@ -0,0 +1,176 @@
+bin/bash
+bin/cat
+bin/echo
+bin/pwd
+bin/stty
+#boot
+etc/bashrc
+etc/certparams
+etc/e2fsck.conf
+etc/fstab
+etc/group
+etc/hddtemp.db
+etc/host.conf
+etc/inittab
+etc/inputrc
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/issue
+etc/ld.so.conf
+etc/logrotate.conf
+etc/mime.types
+etc/modprobe.d
+etc/modprobe.d/btmrvl_sdio.conf
+etc/modprobe.d/cfg80211.conf
+etc/modprobe.d/nf_conntrack.conf
+etc/modprobe.d/pcspeaker.conf
+etc/modules.conf
+etc/mtab
+etc/nsswitch.conf
+#etc/opt
+etc/os-release
+etc/passwd
+etc/profile
+#etc/profile.d
+etc/profile.d/colorls.sh
+etc/profile.d/extrapaths.sh
+etc/profile.d/glib2-locale.sh
+etc/profile.d/i18n.sh
+etc/profile.d/lang.sh
+etc/profile.d/readline.sh
+etc/profile.d/term256.sh
+etc/profile.d/umask.sh
+etc/resolv.conf
+etc/securetty
+etc/sysctl.conf
+etc/sysctl-armv5tel.conf
+etc/syslog.conf
+etc/system-release
+#home
+home/nobody
+#lib
+#lib/firmware
+#lib/firmware/brcm
+lib/firmware/brcm/brcmfmac43362-sdio.txt
+#media
+media/cdrom
+media/floppy
+media/usbkey
+mnt
+#opt
+#opt/pakfire
+#opt/pakfire/db
+#opt/pakfire/db/core
+opt/pakfire/db/core/mine
+#root
+root/.bash_logout
+root/.bash_profile
+root/.bashrc
+root/ipfire
+run
+#sbin
+#srv
+#usr/bin
+usr/bin/captive-cleanup
+#usr/bin/perl
+#usr/include
+#usr/lib
+usr/lib/firewall
+usr/lib/firewall/firewall-lib.pl
+usr/lib/firewall/ipsec-policy
+usr/lib/firewall/rules.pl
+#usr/lib/libgcc_s.so
+usr/lib/libgcc_s.so.1
+#usr/lib/libstdc++.la
+#usr/lib/libstdc++.so
+usr/lib/libstdc++.so.6
+#usr/local
+#usr/local/bin
+#usr/local/bin/archive.files
+usr/local/bin/backupiso
+usr/local/bin/connscheduler
+usr/local/bin/consort.sh
+usr/local/bin/convert-dns-settings
+usr/local/bin/convert-ovpn
+usr/local/bin/convert-to-location
+usr/local/bin/filesystem-cleanup
+usr/local/bin/hddshutdown
+usr/local/bin/ipsec-interfaces
+usr/local/bin/makegraphs
+usr/local/bin/qosd
+usr/local/bin/readhash
+usr/local/bin/rebuild-initrd
+usr/local/bin/run-parts
+usr/local/bin/scanhd
+usr/local/bin/settime
+usr/local/bin/timecheck
+usr/local/bin/timezone-transition
+usr/local/bin/update-lang-cache
+usr/local/bin/update-ids-ruleset
+usr/local/bin/update-location-database
+#usr/local/include
+#usr/local/lib
+#usr/local/sbin
+#usr/local/share
+#usr/local/share/doc
+#usr/local/share/info
+#usr/local/share/locale
+#usr/local/share/man
+#usr/local/share/man/man1
+#usr/local/share/man/man2
+#usr/local/share/man/man3
+#usr/local/share/man/man4
+#usr/local/share/man/man5
+#usr/local/share/man/man6
+#usr/local/share/man/man7
+#usr/local/share/man/man8
+#usr/local/share/misc
+#usr/local/share/terminfo
+#usr/local/share/xt_geoip
+#usr/local/share/zoneinfo
+#usr/local/src
+#usr/sbin
+usr/sbin/openvpn-metrics
+usr/sbin/ovpn-ccd-convert
+usr/sbin/ovpn-collectd-convert
+#usr/share
+#usr/share/doc
+#usr/share/doc/licenses
+usr/share/doc/licenses/GPLv3
+#usr/share/info
+#usr/share/locale
+#usr/share/man
+#usr/share/man/man1
+#usr/share/man/man2
+#usr/share/man/man3
+#usr/share/man/man4
+#usr/share/man/man5
+#usr/share/man/man6
+#usr/share/man/man7
+#usr/share/man/man8
+#usr/share/misc
+#usr/share/terminfo
+#usr/share/xt_geoip
+#usr/share/zoneinfo
+#var
+#var/cache
+var/empty
+#var/lib
+#var/lib/locate
+#var/lib/misc
+#var/local
+var/lock
+#var/log
+var/log/btmp
+var/log/calamaris
+var/log/counter
+var/log/lastlog
+var/log/wtmp
+var/mail
+#var/opt
+var/run
+#var/spool
+var/tmp
+dev/console
+dev/null
+tmp

diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index d7b454884f0623fbb1db215d691499ff3f5acbff..b5bfdde594f90fba7df4487400300408a65ef368 100644 (file)
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -43,7 +43,6 @@ etc/profile.d/umask.sh
 etc/resolv.conf
 etc/securetty
 etc/sysctl.conf
-#etc/sysctl-x86_64.conf
 etc/syslog.conf
 etc/system-release
 #home

diff --git a/lfs/stage2 b/lfs/stage2
index 60d161eddf58b3ed8b0afc5dac52c35b1ee3ca5d..7483a113488a7f2232f7e0f12bead9f544d8079f 100644 (file)
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -85,6 +85,7 @@ 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