IPFire-SCM August 2018

ipfire-scm@lists.ipfire.org

1 participants
54 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 89f634ff9ed358a72c28330f643d5c128bc21b20
by Michael Tremer 14 Aug '18

14 Aug '18

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 89f634ff9ed358a72c28330f643d5c128bc21b20 (commit) from df74fcbff940c9b92cd51be36a5b7c831f9b5292 (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 89f634ff9ed358a72c28330f643d5c128bc21b20 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Aug 14 08:36:19 2018 +0100 Rootfile update Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/avahi | 1 + 1 file changed, 1 insertion(+) Difference in files: diff --git a/config/rootfiles/packages/avahi b/config/rootfiles/packages/avahi index a394cc20a..d8636ca7d 100644 --- a/config/rootfiles/packages/avahi +++ b/config/rootfiles/packages/avahi @@ -7,6 +7,7 @@ etc/avahi/services etc/avahi/services/sftp-ssh.service etc/avahi/services/smb.service etc/avahi/services/ssh.service +#etc/dbus-1/system.d etc/dbus-1/system.d/avahi-dbus.conf etc/rc.d/init.d/avahi usr/bin/avahi-browse hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. df74fcbff940c9b92cd51be36a5b7c831f9b5292
by Michael Tremer 13 Aug '18

13 Aug '18

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 df74fcbff940c9b92cd51be36a5b7c831f9b5292 (commit) via 9d0601917f4f5f34ffca3589ed0d85845d5f4a9c (commit) via d179a9d0a746ba6f763750b0d7a5889ceee37cd5 (commit) from 397d627eab8f6fa3e87996902089237f9acd728f (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 df74fcbff940c9b92cd51be36a5b7c831f9b5292 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 13 19:50:06 2018 +0100 Revert "usbutils: update to 010" This reverts commit b07b1bef22eae7038e7d0fcba0bfd53813f85258. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9d0601917f4f5f34ffca3589ed0d85845d5f4a9c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 13 19:49:58 2018 +0100 Revert "core123: Ship updated usbutils" This reverts commit a65d07ec6d36a712882294b608e718db2d56b24e. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d179a9d0a746ba6f763750b0d7a5889ceee37cd5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 13 19:49:48 2018 +0100 Revert "usbutils: Update rootfile" This reverts commit 9aefd1ed07eee7d83e5b274d4a83240811f9e091. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/usbutils | 1 + config/rootfiles/core/123/filelists/usbutils | 1 - lfs/usbutils | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 120000 config/rootfiles/core/123/filelists/usbutils Difference in files: diff --git a/config/rootfiles/common/usbutils b/config/rootfiles/common/usbutils index f0bdc522b..1162c3ab1 100644 --- a/config/rootfiles/common/usbutils +++ b/config/rootfiles/common/usbutils @@ -2,6 +2,7 @@ usr/bin/lsusb usr/bin/lsusb.py usr/bin/usb-devices usr/bin/usbhid-dump +usr/sbin/update-usbids.sh #usr/share/hwdata #usr/share/hwdata/usb.ids #usr/share/man/man1/usb-devices.1 diff --git a/config/rootfiles/core/123/filelists/usbutils b/config/rootfiles/core/123/filelists/usbutils deleted file mode 120000 index 31db5a7ac..000000000 --- a/config/rootfiles/core/123/filelists/usbutils +++ /dev/null @@ -1 +0,0 @@ -../../../common/usbutils \ No newline at end of file diff --git a/lfs/usbutils b/lfs/usbutils index 41494cf10..51192e7e7 100644 --- a/lfs/usbutils +++ b/lfs/usbutils @@ -24,7 +24,7 @@ include Config -VER = 010 +VER = 007 THISAPP = usbutils-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 938e3707593974be99a0dd6d1de76671 +$(DL_FILE)_MD5 = c9df5107ae9d26b10a1736a261250139 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 397d627eab8f6fa3e87996902089237f9acd728f
by Michael Tremer 13 Aug '18

13 Aug '18

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 397d627eab8f6fa3e87996902089237f9acd728f (commit) from 8defa50e7395714930dd3a813ad4c509711c0b57 (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 397d627eab8f6fa3e87996902089237f9acd728f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 13 18:59:10 2018 +0100 Revert "avahi: Build without dbus" This reverts commit 5221a852e80526d188306b05202e595616f0c065. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/avahi | 11 +++++++++++ lfs/avahi | 3 +-- 2 files changed, 12 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/avahi b/config/rootfiles/packages/avahi index bf8a387c3..a394cc20a 100644 --- a/config/rootfiles/packages/avahi +++ b/config/rootfiles/packages/avahi @@ -7,6 +7,7 @@ etc/avahi/services etc/avahi/services/sftp-ssh.service etc/avahi/services/smb.service etc/avahi/services/ssh.service +etc/dbus-1/system.d/avahi-dbus.conf etc/rc.d/init.d/avahi usr/bin/avahi-browse usr/bin/avahi-browse-domains @@ -89,6 +90,16 @@ usr/sbin/avahi-daemon usr/sbin/avahi-dnsconfd usr/share/avahi usr/share/avahi/avahi-service.dtd +#usr/share/dbus-1/interfaces +usr/share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml +usr/share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml +usr/share/dbus-1/interfaces/org.freedesktop.Avahi.EntryGroup.xml +usr/share/dbus-1/interfaces/org.freedesktop.Avahi.HostNameResolver.xml +usr/share/dbus-1/interfaces/org.freedesktop.Avahi.RecordBrowser.xml +usr/share/dbus-1/interfaces/org.freedesktop.Avahi.Server.xml +usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceBrowser.xml +usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceResolver.xml +usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml #usr/share/locale/ach #usr/share/locale/ach/LC_MESSAGES #usr/share/locale/ach/LC_MESSAGES/avahi.mo diff --git a/lfs/avahi b/lfs/avahi index c476e7e45..cc1d5c336 100644 --- a/lfs/avahi +++ b/lfs/avahi @@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = avahi PAK_VER = 5 -DEPS = "libdaemon" +DEPS = "dbus libdaemon" CFLAGS += -U_FORTIFY_SOURCE @@ -89,7 +89,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --disable-gtk \ --disable-gtk3 \ --disable-pygtk \ - --disable-dbus \ --disable-python \ --disable-pygobject \ --disable-python-dbus \ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8defa50e7395714930dd3a813ad4c509711c0b57
by Michael Tremer 13 Aug '18

13 Aug '18

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 8defa50e7395714930dd3a813ad4c509711c0b57 (commit) from 3d0e252e35ad404529797b3c52232ca52c378f93 (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 8defa50e7395714930dd3a813ad4c509711c0b57 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 13 12:14:49 2018 +0100 aws: Execute user-data script while we have networking up Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/initscripts/helper/aws-setup | 25 +++++++++++++++++-------- src/initscripts/system/aws | 8 -------- 2 files changed, 17 insertions(+), 16 deletions(-) Difference in files: diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup index 122e5a31d..955583c02 100644 --- a/src/initscripts/helper/aws-setup +++ b/src/initscripts/helper/aws-setup @@ -109,8 +109,23 @@ import_aws_configuration() { fi done - # Download user-data - local user_data="$(get user-data)" + # Download the user-data script only on the first boot + if [ ! -e "/var/ipfire/main/firstsetup_ok" ]; then + # Download user-data + local user_data="$(get user-data)" + + # Save user-data script to be executed later + if [ "${user_data:0:2}" = "#!" ]; then + echo "${user_data}" > /tmp/aws-user-data.script + chmod 700 /tmp/aws-user-data.script + + # Run the user-data script + /tmp/aws-user-data.script + + # Delete the script right away + rm /tmp/aws-user-data.script + fi + fi # Import any DNS server settings eval $(/usr/local/bin/readhash <(grep -E "^DNS([0-9])=" /var/ipfire/ethernet/settings 2>/dev/null)) @@ -252,12 +267,6 @@ import_aws_configuration() { # This script has now completed the first steps of setup touch /var/ipfire/main/firstsetup_ok - - # Save user-data script to be executed later - if [ "${user_data:0:2}" = "#!" ]; then - echo "${user_data}" > /tmp/aws-user-data.script - chmod 700 /tmp/aws-user-data.script - fi fi # All done diff --git a/src/initscripts/system/aws b/src/initscripts/system/aws index 896b3b17a..6fce670a0 100644 --- a/src/initscripts/system/aws +++ b/src/initscripts/system/aws @@ -60,14 +60,6 @@ case "${1}" in # End DHCP client immediately dhclient -sf /etc/rc.d/helper/aws-setup -r "${intf}" &>/dev/null - # Run AWS user-data script - if [ -x "/tmp/aws-user-data.script" ]; then - /tmp/aws-user-data.script - - # Delete the script right away - rm /tmp/aws-user-data.script - fi - exit 0 ;; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3d0e252e35ad404529797b3c52232ca52c378f93
by Arne Fitzenreiter 11 Aug '18

11 Aug '18

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 3d0e252e35ad404529797b3c52232ca52c378f93 (commit) from 98ce8975201d48754c89fb2c476571d99d9ae109 (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 3d0e252e35ad404529797b3c52232ca52c378f93 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Aug 11 14:45:56 2018 +0200 intel-microcode: update to 20180807 fixes #11590 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/x86_64/intel-microcode | 6 +++++- .../{oldcore/121 => core/123}/filelists/i586/intel-microcode | 0 .../{oldcore/121 => core/123}/filelists/x86_64/intel-microcode | 0 lfs/intel-microcode | 5 +++-- 4 files changed, 8 insertions(+), 3 deletions(-) copy config/rootfiles/{oldcore/121 => core/123}/filelists/i586/intel-microcode (100%) copy config/rootfiles/{oldcore/121 => core/123}/filelists/x86_64/intel-microcode (100%) Difference in files: diff --git a/config/rootfiles/common/x86_64/intel-microcode b/config/rootfiles/common/x86_64/intel-microcode index e6e62b7f2..946e3d8c4 100644 --- a/config/rootfiles/common/x86_64/intel-microcode +++ b/config/rootfiles/common/x86_64/intel-microcode @@ -43,8 +43,10 @@ lib/firmware/intel-ucode/06-25-02 lib/firmware/intel-ucode/06-25-05 lib/firmware/intel-ucode/06-26-01 lib/firmware/intel-ucode/06-2a-07 +lib/firmware/intel-ucode/06-2c-02 lib/firmware/intel-ucode/06-2d-06 lib/firmware/intel-ucode/06-2d-07 +lib/firmware/intel-ucode/06-2e-06 lib/firmware/intel-ucode/06-2f-02 lib/firmware/intel-ucode/06-3a-09 lib/firmware/intel-ucode/06-3c-03 @@ -64,8 +66,11 @@ lib/firmware/intel-ucode/06-56-02 lib/firmware/intel-ucode/06-56-03 lib/firmware/intel-ucode/06-56-04 lib/firmware/intel-ucode/06-56-05 +lib/firmware/intel-ucode/06-5c-02 lib/firmware/intel-ucode/06-5c-09 +lib/firmware/intel-ucode/06-5c-0a lib/firmware/intel-ucode/06-5e-03 +lib/firmware/intel-ucode/06-5f-01 lib/firmware/intel-ucode/06-7a-01 lib/firmware/intel-ucode/06-8e-09 lib/firmware/intel-ucode/06-8e-0a @@ -94,4 +99,3 @@ lib/firmware/intel-ucode/0f-06-02 lib/firmware/intel-ucode/0f-06-04 lib/firmware/intel-ucode/0f-06-05 lib/firmware/intel-ucode/0f-06-08 -lib/firmware/intel-ucode/list diff --git a/config/rootfiles/core/123/filelists/i586/intel-microcode b/config/rootfiles/core/123/filelists/i586/intel-microcode new file mode 120000 index 000000000..f03e84778 --- /dev/null +++ b/config/rootfiles/core/123/filelists/i586/intel-microcode @@ -0,0 +1 @@ +../../../../common/i586/intel-microcode \ No newline at end of file diff --git a/config/rootfiles/core/123/filelists/x86_64/intel-microcode b/config/rootfiles/core/123/filelists/x86_64/intel-microcode new file mode 120000 index 000000000..d5ac074e2 --- /dev/null +++ b/config/rootfiles/core/123/filelists/x86_64/intel-microcode @@ -0,0 +1 @@ +../../../../common/x86_64/intel-microcode \ No newline at end of file diff --git a/lfs/intel-microcode b/lfs/intel-microcode index 351bb76f1..349f3667c 100644 --- a/lfs/intel-microcode +++ b/lfs/intel-microcode @@ -24,7 +24,7 @@ include Config -VER = 20180425 +VER = 20180807 THISAPP = microcode-$(VER) DL_FILE = $(THISAPP).tgz @@ -41,9 +41,10 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 99c80f9229554953a868127cda44e7e3 +$(DL_FILE)_MD5 = 49f534f1079d3c5bc178a150c1c105aa install : $(TARGET) + check : $(patsubst %,$(DIR_CHK)/%,$(objects)) download :$(patsubst %,$(DIR_DL)/%,$(objects)) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 98ce8975201d48754c89fb2c476571d99d9ae109
by git＠ipfire.org 10 Aug '18

10 Aug '18

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 98ce8975201d48754c89fb2c476571d99d9ae109 (commit) via 5221a852e80526d188306b05202e595616f0c065 (commit) via 4ec7c2936dc06cf3096134e955f4e6ad779c96ae (commit) via 467581b8ab2c9a62a2239a7dcea4fe40fe70093c (commit) via 6064cd87ccfdccc02baaf17e75184ca378977d1c (commit) from ebbca90d70765fac6a42d8ebcc8ec98c1c38f434 (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 98ce8975201d48754c89fb2c476571d99d9ae109 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 10 12:20:38 2018 +0100 avahi: Bump package version Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5221a852e80526d188306b05202e595616f0c065 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 10 12:20:06 2018 +0100 avahi: Build without dbus We don't have any services connected to dbus, so what is the point of avahi trying to connect to it? Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4ec7c2936dc06cf3096134e955f4e6ad779c96ae Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 10 12:18:29 2018 +0100 avahi: Build with -U_FORTIFY_SOURCE Avahi locks up when built with -D_FORTIFY_SOURCE=2 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 467581b8ab2c9a62a2239a7dcea4fe40fe70093c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 10 11:19:25 2018 +0100 avahi: Update to 0.7 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6064cd87ccfdccc02baaf17e75184ca378977d1c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 10 11:08:09 2018 +0100 Revert "avahi: Drop package" This reverts commit aa6ee515c59cd42b12d69981329a2438e4d6e933. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/avahi/smb.service | 9 ++ config/backup/includes/avahi | 1 + config/rootfiles/packages/avahi | 157 +++++++++++++++++++++ config/rootfiles/packages/cups | 3 + lfs/{stunnel => avahi} | 50 ++++--- lfs/cups | 8 +- make.sh | 1 + .../nginx/nginx => src/initscripts/packages/avahi | 18 +-- src/paks/{stunnel => avahi}/install.sh | 14 +- src/paks/{default => avahi}/uninstall.sh | 1 + src/paks/{apcupsd => avahi}/update.sh | 0 11 files changed, 219 insertions(+), 43 deletions(-) create mode 100644 config/avahi/smb.service create mode 100644 config/backup/includes/avahi create mode 100644 config/rootfiles/packages/avahi copy lfs/{stunnel => avahi} (81%) copy config/nginx/nginx => src/initscripts/packages/avahi (54%) copy src/paks/{stunnel => avahi}/install.sh (83%) copy src/paks/{default => avahi}/uninstall.sh (98%) copy src/paks/{apcupsd => avahi}/update.sh (100%) Difference in files: diff --git a/config/avahi/smb.service b/config/avahi/smb.service new file mode 100644 index 000000000..d89535438 --- /dev/null +++ b/config/avahi/smb.service @@ -0,0 +1,9 @@ +<?xml version="1.0" standalone='no'?> +<!DOCTYPE service-group SYSTEM "avahi-service.dtd"> +<service-group> + <name replace-wildcards="yes">Samba Shares on %h</name> + <service> + <type>_smb._tcp</type> + <port>139</port> + </service> +</service-group> diff --git a/config/backup/includes/avahi b/config/backup/includes/avahi new file mode 100644 index 000000000..7f32af64d --- /dev/null +++ b/config/backup/includes/avahi @@ -0,0 +1 @@ +/etc/avahi/avahi-daemon.conf diff --git a/config/rootfiles/packages/avahi b/config/rootfiles/packages/avahi new file mode 100644 index 000000000..bf8a387c3 --- /dev/null +++ b/config/rootfiles/packages/avahi @@ -0,0 +1,157 @@ +etc/avahi +etc/avahi/avahi-autoipd.action +etc/avahi/avahi-daemon.conf +etc/avahi/avahi-dnsconfd.action +etc/avahi/hosts +etc/avahi/services +etc/avahi/services/sftp-ssh.service +etc/avahi/services/smb.service +etc/avahi/services/ssh.service +etc/rc.d/init.d/avahi +usr/bin/avahi-browse +usr/bin/avahi-browse-domains +usr/bin/avahi-publish +usr/bin/avahi-publish-address +usr/bin/avahi-publish-service +usr/bin/avahi-resolve +usr/bin/avahi-resolve-address +usr/bin/avahi-resolve-host-name +usr/bin/avahi-set-host-name +#usr/include/avahi-client +#usr/include/avahi-client/client.h +#usr/include/avahi-client/lookup.h +#usr/include/avahi-client/publish.h +#usr/include/avahi-common +#usr/include/avahi-common/address.h +#usr/include/avahi-common/alternative.h +#usr/include/avahi-common/cdecl.h +#usr/include/avahi-common/defs.h +#usr/include/avahi-common/domain.h +#usr/include/avahi-common/error.h +#usr/include/avahi-common/gccmacro.h +#usr/include/avahi-common/llist.h +#usr/include/avahi-common/malloc.h +#usr/include/avahi-common/rlist.h +#usr/include/avahi-common/simple-watch.h +#usr/include/avahi-common/strlst.h +#usr/include/avahi-common/thread-watch.h +#usr/include/avahi-common/timeval.h +#usr/include/avahi-common/watch.h +#usr/include/avahi-core +#usr/include/avahi-core/core.h +#usr/include/avahi-core/log.h +#usr/include/avahi-core/lookup.h +#usr/include/avahi-core/publish.h +#usr/include/avahi-core/rr.h +#usr/include/avahi-glib +#usr/include/avahi-glib/glib-malloc.h +#usr/include/avahi-glib/glib-watch.h +#usr/include/avahi-gobject +#usr/include/avahi-gobject/ga-client.h +#usr/include/avahi-gobject/ga-entry-group.h +#usr/include/avahi-gobject/ga-enums.h +#usr/include/avahi-gobject/ga-error.h +#usr/include/avahi-gobject/ga-record-browser.h +#usr/include/avahi-gobject/ga-service-browser.h +#usr/include/avahi-gobject/ga-service-resolver.h +#usr/lib/avahi +#usr/lib/libavahi-client.a +#usr/lib/libavahi-client.la +#usr/lib/libavahi-client.so +usr/lib/libavahi-client.so.3 +usr/lib/libavahi-client.so.3.2.9 +#usr/lib/libavahi-common.a +#usr/lib/libavahi-common.la +#usr/lib/libavahi-common.so +usr/lib/libavahi-common.so.3 +usr/lib/libavahi-common.so.3.5.3 +#usr/lib/libavahi-core.a +#usr/lib/libavahi-core.la +#usr/lib/libavahi-core.so +usr/lib/libavahi-core.so.7 +usr/lib/libavahi-core.so.7.0.2 +#usr/lib/libavahi-glib.a +#usr/lib/libavahi-glib.la +#usr/lib/libavahi-glib.so +usr/lib/libavahi-glib.so.1 +usr/lib/libavahi-glib.so.1.0.2 +#usr/lib/libavahi-gobject.a +#usr/lib/libavahi-gobject.la +#usr/lib/libavahi-gobject.so +usr/lib/libavahi-gobject.so.0 +usr/lib/libavahi-gobject.so.0.0.5 +#usr/lib/pkgconfig/avahi-client.pc +#usr/lib/pkgconfig/avahi-core.pc +#usr/lib/pkgconfig/avahi-glib.pc +#usr/lib/pkgconfig/avahi-gobject.pc +usr/sbin/avahi-autoipd +usr/sbin/avahi-daemon +usr/sbin/avahi-dnsconfd +usr/share/avahi +usr/share/avahi/avahi-service.dtd +#usr/share/locale/ach +#usr/share/locale/ach/LC_MESSAGES +#usr/share/locale/ach/LC_MESSAGES/avahi.mo +#usr/share/locale/ar/LC_MESSAGES/avahi.mo +#usr/share/locale/bg/LC_MESSAGES/avahi.mo +#usr/share/locale/ca/LC_MESSAGES/avahi.mo +#usr/share/locale/cs/LC_MESSAGES/avahi.mo +#usr/share/locale/da/LC_MESSAGES/avahi.mo +#usr/share/locale/de/LC_MESSAGES/avahi.mo +#usr/share/locale/el/LC_MESSAGES/avahi.mo +#usr/share/locale/en_AU/LC_MESSAGES/avahi.mo +#usr/share/locale/en_CA/LC_MESSAGES/avahi.mo +#usr/share/locale/en_GB/LC_MESSAGES/avahi.mo +#usr/share/locale/en_NZ +#usr/share/locale/en_NZ/LC_MESSAGES +#usr/share/locale/en_NZ/LC_MESSAGES/avahi.mo +#usr/share/locale/eo/LC_MESSAGES/avahi.mo +#usr/share/locale/es/LC_MESSAGES/avahi.mo +#usr/share/locale/et/LC_MESSAGES/avahi.mo +#usr/share/locale/fa/LC_MESSAGES/avahi.mo +#usr/share/locale/fi/LC_MESSAGES/avahi.mo +#usr/share/locale/fo +#usr/share/locale/fo/LC_MESSAGES +#usr/share/locale/fo/LC_MESSAGES/avahi.mo +#usr/share/locale/fr/LC_MESSAGES/avahi.mo +#usr/share/locale/gl/LC_MESSAGES/avahi.mo +#usr/share/locale/he/LC_MESSAGES/avahi.mo +#usr/share/locale/hu/LC_MESSAGES/avahi.mo +#usr/share/locale/id/LC_MESSAGES/avahi.mo +#usr/share/locale/it/LC_MESSAGES/avahi.mo +#usr/share/locale/ja/LC_MESSAGES/avahi.mo +#usr/share/locale/ko/LC_MESSAGES/avahi.mo +#usr/share/locale/lv/LC_MESSAGES/avahi.mo +#usr/share/locale/ms/LC_MESSAGES/avahi.mo +#usr/share/locale/nl/LC_MESSAGES/avahi.mo +#usr/share/locale/oc/LC_MESSAGES/avahi.mo +#usr/share/locale/pl/LC_MESSAGES/avahi.mo +#usr/share/locale/pt_BR/LC_MESSAGES/avahi.mo +#usr/share/locale/ro/LC_MESSAGES/avahi.mo +#usr/share/locale/ru/LC_MESSAGES/avahi.mo +#usr/share/locale/sk/LC_MESSAGES/avahi.mo +#usr/share/locale/sl/LC_MESSAGES/avahi.mo +#usr/share/locale/sr/LC_MESSAGES/avahi.mo +#usr/share/locale/sr(a)latin/LC_MESSAGES/avahi.mo +#usr/share/locale/sv/LC_MESSAGES/avahi.mo +#usr/share/locale/tr/LC_MESSAGES/avahi.mo +#usr/share/locale/uk/LC_MESSAGES/avahi.mo +#usr/share/locale/zh_CN/LC_MESSAGES/avahi.mo +#usr/share/locale/zh_TW/LC_MESSAGES/avahi.mo +#usr/share/man/man1/avahi-browse-domains.1 +#usr/share/man/man1/avahi-browse.1 +#usr/share/man/man1/avahi-publish-address.1 +#usr/share/man/man1/avahi-publish-service.1 +#usr/share/man/man1/avahi-publish.1 +#usr/share/man/man1/avahi-resolve-address.1 +#usr/share/man/man1/avahi-resolve-host-name.1 +#usr/share/man/man1/avahi-resolve.1 +#usr/share/man/man1/avahi-set-host-name.1 +#usr/share/man/man5/avahi-daemon.conf.5 +#usr/share/man/man5/avahi.hosts.5 +#usr/share/man/man5/avahi.service.5 +#usr/share/man/man8/avahi-autoipd.8 +#usr/share/man/man8/avahi-autoipd.action.8 +#usr/share/man/man8/avahi-daemon.8 +#usr/share/man/man8/avahi-dnsconfd.8 +#usr/share/man/man8/avahi-dnsconfd.action.8 diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups index 05a618dd3..8234be5e1 100644 --- a/config/rootfiles/packages/cups +++ b/config/rootfiles/packages/cups @@ -17,6 +17,7 @@ usr/bin/cancel #usr/bin/cups-config usr/bin/cupstestdsc usr/bin/cupstestppd +usr/bin/ippfind usr/bin/ipptool usr/bin/lp usr/bin/lpoptions @@ -47,6 +48,7 @@ usr/bin/ppdpo #usr/include/cups/versioning.h usr/lib/cups usr/lib/cups/backend +usr/lib/cups/backend/dnssd usr/lib/cups/backend/http usr/lib/cups/backend/https usr/lib/cups/backend/ipp @@ -721,6 +723,7 @@ usr/share/locale/ru/cups_ru.po #usr/share/man/man1/cups.1.gz #usr/share/man/man1/cupstestdsc.1.gz #usr/share/man/man1/cupstestppd.1.gz +#usr/share/man/man1/ippfind.1.gz #usr/share/man/man1/ipptool.1.gz #usr/share/man/man1/lp.1.gz #usr/share/man/man1/lpoptions.1.gz diff --git a/lfs/avahi b/lfs/avahi new file mode 100644 index 000000000..c476e7e45 --- /dev/null +++ b/lfs/avahi @@ -0,0 +1,109 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.7 + +THISAPP = avahi-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = avahi +PAK_VER = 5 + +DEPS = "libdaemon" + +CFLAGS += -U_FORTIFY_SOURCE + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = d76c59d0882ac6c256d70a2a585362a6 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-avahi-user=avahi \ + --disable-qt3 \ + --disable-qt4 \ + --disable-gtk \ + --disable-gtk3 \ + --disable-pygtk \ + --disable-dbus \ + --disable-python \ + --disable-pygobject \ + --disable-python-dbus \ + --disable-mono \ + --disable-monodoc \ + --with-distro=none + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + + # Install configuration for samba + cp -avf $(DIR_SRC)/config/avahi/smb.service /etc/avahi/services/smb.service + + # Install initscript + $(call INSTALL_INITSCRIPT,avahi) + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/cups b/lfs/cups index a9e2b1ac0..ae0c603b7 100644 --- a/lfs/cups +++ b/lfs/cups @@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/cups-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups -PAK_VER = 16 +PAK_VER = 17 -DEPS = "cups-filters dbus ghostscript krb5 libtiff" +DEPS = "avahi cups-filters dbus ghostscript krb5 libtiff" ############################################################################### # Top-level Rules @@ -83,10 +83,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --sysconfdir=/var/ipfire \ --localstatedir=/var \ --enable-debug \ + --enable-avahi \ --enable-dbus \ --enable-gnutls \ - --enable-libusb \ - --disable-avahi + --enable-libusb cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install diff --git a/make.sh b/make.sh index f26f713c8..f1b2dc209 100755 --- a/make.sh +++ b/make.sh @@ -1329,6 +1329,7 @@ buildipfire() { lfsmake2 dbus lfsmake2 intltool lfsmake2 libdaemon + lfsmake2 avahi lfsmake2 cups lfsmake2 lcms2 lfsmake2 ghostscript diff --git a/src/initscripts/packages/avahi b/src/initscripts/packages/avahi new file mode 100755 index 000000000..7413f56f1 --- /dev/null +++ b/src/initscripts/packages/avahi @@ -0,0 +1,45 @@ +#!/bin/sh +# Begin $rc_base/init.d/avahi + +# Based on sysklogd script from LFS-3.1 and earlier. +# Rewritten by Gerard Beekmans - gerard(a)linuxfromscratch.org + +#$LastChangedBy: bdubbs $ +#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $ + +. /etc/sysconfig/rc +. $rc_functions + +case "$1" in + start) + boot_mesg "Starting avahi..." + loadproc /usr/sbin/avahi-daemon -f /etc/avahi/avahi-daemon.conf -D + ;; + + stop) + boot_mesg "Stopping avahi..." + /usr/sbin/avahi-daemon -k + ;; + + reload) + boot_mesg "Reloading avahi..." + reloadproc /usr/sbin/avahi-daemon -f /etc/avahi/avahi-daemon.conf -D + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + status) + statusproc /usr/sbin/avahi-daemon -c + ;; + + *) + echo "Usage: $0 {start|stop|reload|restart|status}" + exit 1 + ;; +esac + +# End $rc_base/init.d/avahi diff --git a/src/paks/avahi/install.sh b/src/paks/avahi/install.sh new file mode 100644 index 000000000..cb0266bae --- /dev/null +++ b/src/paks/avahi/install.sh @@ -0,0 +1,37 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh + +# Create Username and group. +getent group avahi >/dev/null || groupadd -r avahi +getent passwd avahi >/dev/null || \ + useradd -r -g avahi -d /var/run/avahi-daemon -s /sbin/nologin \ + -c "Avahi mDNS daemon" avahi + +extract_files +ln -svf ../init.d/avahi /etc/rc.d/rc3.d/S65avahi +ln -svf ../init.d/avahi /etc/rc.d/rc0.d/K35avahi +ln -svf ../init.d/avahi /etc/rc.d/rc6.d/K35avahi +restore_backup ${NAME} +start_service --background ${NAME} diff --git a/src/paks/avahi/uninstall.sh b/src/paks/avahi/uninstall.sh new file mode 100644 index 000000000..1c8e67c9a --- /dev/null +++ b/src/paks/avahi/uninstall.sh @@ -0,0 +1,28 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +stop_service ${NAME} +make_backup ${NAME} +remove_files +rm -rf /etc/rc.d/rc*.d/*avahi diff --git a/src/paks/avahi/update.sh b/src/paks/avahi/update.sh new file mode 100644 index 000000000..89c40d0d7 --- /dev/null +++ b/src/paks/avahi/update.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ebbca90d70765fac6a42d8ebcc8ec98c1c38f434
by git＠ipfire.org 09 Aug '18

09 Aug '18

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 ebbca90d70765fac6a42d8ebcc8ec98c1c38f434 (commit) from 7f841117c5377136b85c878fa7252e9a4458a526 (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 ebbca90d70765fac6a42d8ebcc8ec98c1c38f434 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 9 16:28:14 2018 +0100 openssh: Disable password authentication by default Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/openssh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/lfs/openssh b/lfs/openssh index 9d551f198..a88b2d126 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -86,7 +86,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -e 's/^#\?Protocol .*$$/Protocol 2/' \ -e 's/^#\?LoginGraceTime .*$$/LoginGraceTime 30s/' \ -e 's/^#\?PubkeyAuthentication .*$$/PubkeyAuthentication yes/' \ - -e 's/^#\?PasswordAuthentication .*$$/PasswordAuthentication yes/' \ + -e 's/^#\?PasswordAuthentication .*$$/PasswordAuthentication no/' \ -e 's/^#\?MaxStartups .*$$/MaxStartups 5/' \ -e 's/^#\?IgnoreUserKnownHosts .*$$/IgnoreUserKnownHosts yes/' \ -e 's/^#\?UsePAM .*$$//' \ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7f841117c5377136b85c878fa7252e9a4458a526
by git＠ipfire.org 08 Aug '18

08 Aug '18

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 7f841117c5377136b85c878fa7252e9a4458a526 (commit) from 07664187ac7323af8cbcce166be6fb5e6786fdca (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 7f841117c5377136b85c878fa7252e9a4458a526 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Aug 8 10:26:38 2018 +0200 kernel: fix build on x86_64 oops i deleted a wrong line... Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/linux | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Difference in files: diff --git a/lfs/linux b/lfs/linux index cfdcc4a42..5e7b334cd 100644 --- a/lfs/linux +++ b/lfs/linux @@ -37,8 +37,9 @@ CXXFLAGS = PAK_VER = 76 DEPS = "" -KERNEL_TARGET = bzImage HEADERS_ARCH = $(BUILD_PLATFORM) +KERNEL_ARCH = $(BUILD_ARCH) +KERNEL_TARGET = bzImage ifeq "$(BUILD_ARCH)" "i586" KERNEL_ARCH = i386 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 07664187ac7323af8cbcce166be6fb5e6786fdca
by git＠ipfire.org 07 Aug '18

07 Aug '18

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 07664187ac7323af8cbcce166be6fb5e6786fdca (commit) from 7529349754e0f99f626a36c895347806fc6f2dd2 (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 07664187ac7323af8cbcce166be6fb5e6786fdca Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Aug 7 19:05:35 2018 +0200 kernel: fix build on armv5tel Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/lfs/linux b/lfs/linux index b5877fc5b..cfdcc4a42 100644 --- a/lfs/linux +++ b/lfs/linux @@ -37,7 +37,6 @@ CXXFLAGS = PAK_VER = 76 DEPS = "" -KERNEL_ARCH = $(BUILD_ARCH) KERNEL_TARGET = bzImage HEADERS_ARCH = $(BUILD_PLATFORM) @@ -52,6 +51,7 @@ ifeq "$(BUILD_ARCH)" "aarch64" endif ifeq "$(BUILD_ARCH)" "armv5tel" + KERNEL_ARCH = arm KERNEL_TARGET = zImage endif hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7529349754e0f99f626a36c895347806fc6f2dd2
by git＠ipfire.org 05 Aug '18

05 Aug '18

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 7529349754e0f99f626a36c895347806fc6f2dd2 (commit) via 28b252145a3240caea81d586d3e63db72c573c87 (commit) via b403b04a139c02156829d8d21943bc69b2cf0c53 (commit) from 4a50681905af88adb0c4c19e6bc7dfda3dbe3606 (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 7529349754e0f99f626a36c895347806fc6f2dd2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Aug 5 17:19:52 2018 +0200 kernel: apu2 leds: update string for newer bios Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 28b252145a3240caea81d586d3e63db72c573c87 Merge: b403b04a1 4a5068190 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Aug 5 17:19:36 2018 +0200 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next commit b403b04a139c02156829d8d21943bc69b2cf0c53 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Aug 5 13:32:36 2018 +0200 initrd: add early microcode load Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/dracut/dracut.conf | 3 +++ config/rootfiles/core/123/update.sh | 3 +++ lfs/cdrom | 2 +- lfs/linux | 2 +- lfs/linux-initrd | 2 +- src/paks/linux-pae/install.sh | 2 +- src/patches/linux/linux-4.9.8-apu_leds.patch | 2 +- src/scripts/rebuild-initrd | 2 +- 8 files changed, 12 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/dracut/dracut.conf b/config/dracut/dracut.conf index 52bba9c62..e9bd566b6 100644 --- a/config/dracut/dracut.conf +++ b/config/dracut/dracut.conf @@ -31,6 +31,9 @@ filesystems+="reiserfs vfat xfs" #hostonly="yes" # +# Load microcode for the CPU early +early_microcode=yes + # install local /etc/mdadm.conf #mdadmconf="no" diff --git a/config/rootfiles/core/123/update.sh b/config/rootfiles/core/123/update.sh index cf488ec49..76eff74bb 100644 --- a/config/rootfiles/core/123/update.sh +++ b/config/rootfiles/core/123/update.sh @@ -51,6 +51,9 @@ ldconfig /etc/init.d/unbound restart /etc/init.d/squid start +# rebuild initrd to add early microcode updates +rebuild-initrd + # This update needs a reboot... touch /var/run/need_reboot diff --git a/lfs/cdrom b/lfs/cdrom index 6382034b5..08bd609c4 100644 --- a/lfs/cdrom +++ b/lfs/cdrom @@ -84,7 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) dd if=/dev/zero bs=1k count=2 > /install/cdrom/boot/isolinux/boot.catalog ifneq "$(BUILD_PLATFORM)" "arm" cp /boot/vmlinuz-$(KVER)-ipfire /install/cdrom/boot/isolinux/vmlinuz - dracut --force -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire + dracut --force --early-microcode -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire cp $(DIR_SRC)/config/syslinux/boot.png /install/cdrom/boot/isolinux/boot.png cp /usr/lib/memtest86+/memtest.bin /install/cdrom/boot/isolinux/memtest cp /usr/share/ipfire-netboot/ipxe.lkrn /install/cdrom/boot/isolinux/netboot diff --git a/lfs/linux b/lfs/linux index c5d8a8e88..b5877fc5b 100644 --- a/lfs/linux +++ b/lfs/linux @@ -34,7 +34,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 75 +PAK_VER = 76 DEPS = "" KERNEL_ARCH = $(BUILD_ARCH) diff --git a/lfs/linux-initrd b/lfs/linux-initrd index 1e6b071f9..93f21078e 100644 --- a/lfs/linux-initrd +++ b/lfs/linux-initrd @@ -62,7 +62,7 @@ ifneq "$(KCFG)" "-rpi" ifneq "$(KCFG)" "-pae" # Create initramfs images - dracut --force --verbose --strip --xz /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX) + dracut --force --early-microcode --verbose --strip --xz /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX) ifeq "$(KCFG)" "-kirkwood" # cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(VERSUFIX) diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh index e5f82c567..fd71621d5 100644 --- a/src/paks/linux-pae/install.sh +++ b/src/paks/linux-pae/install.sh @@ -60,7 +60,7 @@ depmod -a $KVER-ipfire-pae # # Made initramdisk # -/usr/bin/dracut --force --xz /boot/initramfs-$KVER-ipfire-pae.img $KVER-ipfire-pae +/usr/bin/dracut --force --early-microcode --xz /boot/initramfs-$KVER-ipfire-pae.img $KVER-ipfire-pae if [ -e /boot/grub/grub.cfg ]; then # diff --git a/src/patches/linux/linux-4.9.8-apu_leds.patch b/src/patches/linux/linux-4.9.8-apu_leds.patch index d34017896..27da2f166 100644 --- a/src/patches/linux/linux-4.9.8-apu_leds.patch +++ b/src/patches/linux/linux-4.9.8-apu_leds.patch @@ -175,7 +175,7 @@ diff -Naur linux-4.9.8.org/arch/x86/platform/apu/apu2-led.c linux-4.9.8/arch/x86 + goto out; + + product = dmi_get_system_info(DMI_PRODUCT_NAME); -+ if (!product || strcmp(product, "apu2")) ++ if (!product || (strcmp(product, "PC Engines apu2") && strcmp(product, "apu2")) ) + goto out; + + printk(KERN_INFO "%s: system is recognized as \"%s %s\"\n", diff --git a/src/scripts/rebuild-initrd b/src/scripts/rebuild-initrd index 06f30bbf0..91e68ca57 100644 --- a/src/scripts/rebuild-initrd +++ b/src/scripts/rebuild-initrd @@ -24,4 +24,4 @@ # KVER=`uname -r | cut -d"-" -f1` -dracut --force --verbose /boot/ipfirerd-$KVER.img $KVER-ipfire +dracut --force --early-microcode --verbose /boot/ipfirerd-$KVER.img $KVER-ipfire hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM August 2018