* [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 7ae1dcb33e27d2ea354acd6e7093741781e4092d
@ 2021-04-11 12:13 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2021-04-11 12:13 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 7383 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, master has been updated
via 7ae1dcb33e27d2ea354acd6e7093741781e4092d (commit)
from b119887b50675121a30d889fdbfc6c342e068c5a (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 7ae1dcb33e27d2ea354acd6e7093741781e4092d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Apr 11 12:12:16 2021 +0000
Install sysctl.conf only on those architectures where needed
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/{etc => etc-aarch64}/sysctl-aarch64.conf | 0
config/{etc => etc-armv5tel}/sysctl-armv5tel.conf | 0
config/{etc => etc-x86_64}/sysctl-x86_64.conf | 0
config/rootfiles/common/aarch64/stage2 | 2 +-
config/rootfiles/common/{ => armv5tel}/stage2 | 2 +-
config/rootfiles/common/stage2 | 1 -
lfs/stage2 | 1 +
7 files changed, 3 insertions(+), 3 deletions(-)
rename config/{etc => etc-aarch64}/sysctl-aarch64.conf (100%)
rename config/{etc => etc-armv5tel}/sysctl-armv5tel.conf (100%)
rename config/{etc => etc-x86_64}/sysctl-x86_64.conf (100%)
copy config/rootfiles/common/{ => armv5tel}/stage2 (99%)
Difference in files:
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 1db148203..59d85aabc 100644
--- 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
index 000000000..9eebe6046
--- /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 d7b454884..b5bfdde59 100644
--- 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 60d161edd..7483a1134 100644
--- 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
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-04-11 12:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-11 12:13 [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 7ae1dcb33e27d2ea354acd6e7093741781e4092d Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox