Merge branch 'kernel-5.14' of git.ipfire.org:/pub/git/people/arne_f/ipfire-2.x into...

diff --git a/config/rootfiles/common/i586/acpid b/config/rootfiles/common/acpid
similarity index 100%
rename from config/rootfiles/common/i586/acpid
rename to config/rootfiles/common/acpid

diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
index 7b94faf5c715f2c1d8aff3433f863cc54854c5c0..9e9e1a71a50d893dae15ccbf7e324b12552993b0 100644 (file)
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -3,6 +3,7 @@ etc/init.d
 #etc/rc.d/helper
 etc/rc.d/helper/getdnsfromdhcpc.pl
 #etc/rc.d/init.d
+etc/rc.d/init.d/acpid
 etc/rc.d/init.d/apache
 etc/rc.d/init.d/beep
 etc/rc.d/init.d/checkfs
@@ -108,6 +109,7 @@ etc/rc.d/rc0.d/K80network
 etc/rc.d/rc0.d/K82wlanclient
 #etc/rc.d/rc0.d/K84bluetooth
 #etc/rc.d/rc0.d/K85messagebus
+etc/rc.d/rc0.d/K87acpid
 etc/rc.d/rc0.d/K90sysklogd
 etc/rc.d/rc0.d/S60sendsignals
 etc/rc.d/rc0.d/S70localnet
@@ -118,6 +120,7 @@ etc/rc.d/rc0.d/S99halt
 etc/rc.d/rc3.d/S01vnstat
 etc/rc.d/rc3.d/S10sysklogd
 etc/rc.d/rc3.d/S11unbound
+etc/rc.d/rc3.d/S12acpid
 etc/rc.d/rc3.d/S15fireinfo
 #etc/rc.d/rc3.d/S15messagebus
 #etc/rc.d/rc3.d/S16bluetooth
@@ -157,6 +160,7 @@ etc/rc.d/rc6.d/K80network
 etc/rc.d/rc6.d/K82wlanclient
 #etc/rc.d/rc6.d/K84bluetooth
 #etc/rc.d/rc6.d/K85messagebus
+etc/rc.d/rc6.d/K87acpid
 etc/rc.d/rc6.d/K90sysklogd
 etc/rc.d/rc6.d/S60sendsignals
 etc/rc.d/rc6.d/S70mountfs

diff --git a/config/rootfiles/common/x86_64/acpid b/config/rootfiles/common/x86_64/acpid
deleted file mode 100644 (file)
index 85a110d..0000000
--- a/config/rootfiles/common/x86_64/acpid
+++ /dev/null
@@ -1,17 +0,0 @@
-etc/acpi
-etc/acpi/actions
-etc/acpi/actions/power.sh
-etc/acpi/events
-etc/acpi/events/power
-usr/bin/acpi_listen
-usr/sbin/acpid
-#usr/sbin/kacpimon
-#usr/share/doc/acpid-2.0.26
-#usr/share/doc/acpid-2.0.26/COPYING
-#usr/share/doc/acpid-2.0.26/Changelog
-#usr/share/doc/acpid-2.0.26/README
-#usr/share/doc/acpid-2.0.26/TESTPLAN
-#usr/share/doc/acpid-2.0.26/TODO
-#usr/share/man/man8/acpi_listen.8
-#usr/share/man/man8/acpid.8
-#usr/share/man/man8/kacpimon.8

diff --git a/lfs/acpid b/lfs/acpid
index 9329f6c9e2587eeea18b0ae248e16af6080b9a80..c70d130d93129ac6125e0c84961b6df7dd2b2810 100644 (file)
--- a/lfs/acpid
+++ b/lfs/acpid
@@ -31,7 +31,6 @@ DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH   = x86_64 i586
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/initscripts b/lfs/initscripts
index cb3f4e048126193148f65cadd68fd6b31119a730..0d7f40cadb8951c47ee6b18615ed4d7ac145d79f 100644 (file)
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -196,15 +196,13 @@ $(TARGET) :
                ln -sf any /etc/rc.d/init.d/networking/$$i; \
        done
 
-       # ARM does not need acpid, intel no swconfig
+       # intel intel no swconfig
 ifeq "$(BUILD_PLATFORM)" "arm"
-       rm -vf /etc/rc.d/init.d/acpid
        ln -sf ../init.d/swconfig    /etc/rc.d/rcsysinit.d/S73swconfig
 else
        rm -vf /etc/rc.d/init.d/swconfig
+endif
        ln -sf ../init.d/acpid       /etc/rc.d/rc3.d/S12acpid
        ln -sf ../init.d/acpid       /etc/rc.d/rc0.d/K87acpid
        ln -sf ../init.d/acpid       /etc/rc.d/rc6.d/K87acpid
-endif
-
        @$(POSTBUILD)