[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 99c2ca36b80c85bd1d2d5c5fcb5f05b29f6e1a85

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 99c2ca36b80c85bd1d2d5c5fcb5f05b29f6e1a85

[git]

[-- Attachment #1: Type: text/plain, Size: 4497 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  99c2ca36b80c85bd1d2d5c5fcb5f05b29f6e1a85 (commit)
       via  78aaf71665bfc73015c8a9cdfeea64ff064e6084 (commit)
       via  458c7d36cce61af5e2e25d247b46c491627b45fe (commit)
       via  98f0446e94935611f1b3f6395ba84091ba17ecca (commit)
      from  a97d2fb794f33875a6211a4b337e39f02df4af75 (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 99c2ca36b80c85bd1d2d5c5fcb5f05b29f6e1a85
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Jun 16 13:14:54 2018 +0200

    linux-pae: bump package version
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 78aaf71665bfc73015c8a9cdfeea64ff064e6084
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Jun 16 11:45:32 2018 +0200

    core122: add missing "then" at microcode reload
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 458c7d36cce61af5e2e25d247b46c491627b45fe
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Jun 16 11:36:06 2018 +0200

    core-updates: don't restart pakfire at error
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 98f0446e94935611f1b3f6395ba84091ba17ecca
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Jun 16 10:19:44 2018 +0200

    core-update: disable compression for outside tar
    
    this files are already xz compressend in the inner tar so
    they are not further compressable and this is only a time waste.
    
    Signew-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/121/update.sh | 2 ++
 config/rootfiles/core/122/update.sh | 4 +++-
 lfs/core-updates                    | 2 +-
 lfs/linux                           | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/121/update.sh b/config/rootfiles/core/121/update.sh
index 1d4bd5306..4d19e48f5 100644
--- a/config/rootfiles/core/121/update.sh
+++ b/config/rootfiles/core/121/update.sh
@@ -29,6 +29,8 @@ core=121
 exit_with_error() {
 	# Set last succesfull installed core.
 	echo $(($core-1)) > /opt/pakfire/db/core/mine
+	# don't start pakfire again at error
+	killall -KILL pak_update
 	/usr/bin/logger -p syslog.emerg -t ipfire \
 		"core-update-${core}: $1"
 	exit $2
diff --git a/config/rootfiles/core/122/update.sh b/config/rootfiles/core/122/update.sh
index 6105bf280..5a7f8949b 100644
--- a/config/rootfiles/core/122/update.sh
+++ b/config/rootfiles/core/122/update.sh
@@ -29,6 +29,8 @@ core=122
 exit_with_error() {
 	# Set last succesfull installed core.
 	echo $(($core-1)) > /opt/pakfire/db/core/mine
+	# don't start pakfire again at error
+	killall -KILL pak_update
 	/usr/bin/logger -p syslog.emerg -t ipfire \
 		"core-update-${core}: $1"
 	exit $2
@@ -149,7 +151,7 @@ sync
 
 # Reload microcode
 modprobe microcode
-if [ -w "/sys/devices/system/cpu/microcode/reload" ];
+if [ -w "/sys/devices/system/cpu/microcode/reload" ]; then
 	echo 1 > /sys/devices/system/cpu/microcode/reload
 fi
 
diff --git a/lfs/core-updates b/lfs/core-updates
index 3d12d40b1..19b57a5a2 100644
--- a/lfs/core-updates
+++ b/lfs/core-updates
@@ -89,7 +89,7 @@ core/%:
 	#Change xxxKVERxxx to Kernelversion
 	sed -e "s/xxxKVERxxx/$(KVER)/g" -i /install/packages/package/update.sh
 
-	cd /install/packages/package && XZ_OPT="$(XZ_OPT)" tar cf ../core-upgrade-$(VERSION)-$$(basename $@).ipfire $(TAR_OPTIONS) \
+	cd /install/packages/package && tar cf ../core-upgrade-$(VERSION)-$$(basename $@).ipfire \
 		update.sh files.tar.xz ROOTFILES
 	rm -rf /install/packages/package
 	sed -e "s/NAME/core-upgrade/g" \
diff --git a/lfs/linux b/lfs/linux
index 007bbf4fb..55df73159 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -34,7 +34,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 73
+PAK_VER    = 74
 DEPS	   = ""
 
 ifeq "$(BUILD_ARCH)" "i586"


hooks/post-receive
--
IPFire 2.x development tree