From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 465a08b6290e42e2dbf771505c0a87deb4ba756d
Date: Thu, 21 May 2015 11:30:33 +0200 [thread overview]
Message-ID: <20150521093033.EE4E322385@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 5843 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 465a08b6290e42e2dbf771505c0a87deb4ba756d (commit)
via d6a15c76a779697faf64b727cfff35a871c1ee08 (commit)
via 9d05aa770ae2ee6b34c0a0921f83b7c4663b9af3 (commit)
via 888726854ff409a6f57b01592083eb6256d65250 (commit)
from bfa284b41cb96f44e9dc1fa948d865e1b9205c1e (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 465a08b6290e42e2dbf771505c0a87deb4ba756d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu May 21 11:30:03 2015 +0200
kernel: update to 3.14.43
commit d6a15c76a779697faf64b727cfff35a871c1ee08
Merge: bfa284b 9d05aa7
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu May 21 11:16:35 2015 +0200
Merge remote-tracking branch 'origin/core90'
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/90/update.sh | 19 +++---------------
lfs/linux | 18 ++++++++---------
src/paks/linux-pae/install.sh | 41 +++++++++++++++++---------------------
3 files changed, 30 insertions(+), 48 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh
index fa67f6b..34dacf1 100644
--- a/config/rootfiles/core/90/update.sh
+++ b/config/rootfiles/core/90/update.sh
@@ -225,22 +225,9 @@ if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
/etc/init.d/ipsec start
fi
-case "$(uname -m)" in
- i?86)
- case "$(find_device "/")" in
- xvd* )
- echo Skip remove grub2 files, because pygrub fail.
- rm -f /boot/grub/*
- echo config will recreated by linux-pae install.
- ;;
- * )
- #
- # Update to GRUB2 config
- #
- grub-mkconfig > /boot/grub/grub.cfg
- ;;
- esac
-esac
+if [ -e /boot/grub/grub.cfg ]; then
+ grub-mkconfig > /boot/grub/grub.cfg
+fi
# Upadate Kernel version uEnv.txt
if [ -e /boot/uEnv.txt ]; then
diff --git a/lfs/linux b/lfs/linux
index b2d2552..f59a709 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,11 +24,11 @@
include Config
-VER = 3.14.41
+VER = 3.14.43
-RPI_PATCHES = 3.14.41-grsec-ipfire1
-A7M_PATCHES = 3.14.41-grsec-ipfire1
-GRS_PATCHES = grsecurity-3.1-3.14.41-201505072056.patch.xz
+RPI_PATCHES = 3.14.43-grsec-ipfire1
+A7M_PATCHES = 3.14.43-grsec-ipfire1
+GRS_PATCHES = grsecurity-3.1-3.14.43-201505191737.patch.xz
THISAPP = linux-$(VER)
DL_FILE = linux-$(VER).tar.xz
@@ -37,7 +37,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
CFLAGS =
CXXFLAGS =
-PAK_VER = 59
+PAK_VER = 61
DEPS = ""
VERSUFIX=ipfire$(KCFG)
@@ -77,10 +77,10 @@ rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).
arm7-multi-patches-$(A7M_PATCHES).patch.xz = $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz
$(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES)
-$(DL_FILE)_MD5 = b28dfc6907c388c2adcc65aee2ad68ff
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 9c8b20647429a64d656999a3c7af890f
-arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = a4a4103255e93bfcb02652212b0ae3fc
-$(GRS_PATCHES)_MD5 = 8af3b27954311da581cc6f803f048779
+$(DL_FILE)_MD5 = 927f2343f298dfe531a8371f81356e53
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = b5ba925ae1d4279d3ac0f03c27dd16eb
+arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = b9c696fe4f22b05b81c168329ca33c94
+$(GRS_PATCHES)_MD5 = 35e26b1214b1b0b515ee67e5ce50633a
install : $(TARGET)
diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh
index c980a01..27e665f 100644
--- a/src/paks/linux-pae/install.sh
+++ b/src/paks/linux-pae/install.sh
@@ -55,29 +55,24 @@ depmod -a $KVER-ipfire-pae
#
/usr/bin/dracut --force --xz /boot/initramfs-$KVER-ipfire-pae.img $KVER-ipfire-pae
-
-ROOT="$(find_partition "/")"
-case $ROOT in
- xvd* )
- #
- # We are on XEN so create new grub.conf / menu.lst for pygrub
- #
- echo "timeout 10" > /boot/grub/grub.conf
- echo "default 0" >> /boot/grub/grub.conf
- echo "title IPFire (pae-kernel)" >> /boot/grub/grub.conf
- echo " kernel /vmlinuz-$KVER-ipfire-pae root=/dev/$ROOT rootdelay=10 panic=10 console=hvc0" \
- >> /boot/grub/grub.conf
- echo " initrd /initramfs-$KVER-ipfire-pae.img" >> /boot/grub/grub.conf
- echo "# savedefault 0" >> /boot/grub/grub.conf
- ln -s grub.conf $MNThdd/boot/grub/menu.lst
- ;;
- * )
- #
- # Update grub2 config
- #
- grub-mkconfig > /boot/grub/grub.cfg
- ;;
-esac
+if [ -e /boot/grub/grub.cfg ]; then
+ #
+ # Update grub2 config
+ #
+ grub-mkconfig > /boot/grub/grub.cfg
+else
+ #
+ # xen pv with pygrub need grub.conf / menu.lst
+ #
+ echo "timeout 10" > /boot/grub/grub.conf
+ echo "default 0" >> /boot/grub/grub.conf
+ echo "title IPFire (pae-kernel)" >> /boot/grub/grub.conf
+ echo " kernel /vmlinuz-$KVER-ipfire-pae root=/dev/$ROOT rootdelay=10 panic=10 console=hvc0" \
+ >> /boot/grub/grub.conf
+ echo " initrd /initramfs-$KVER-ipfire-pae.img" >> /boot/grub/grub.conf
+ echo "# savedefault 0" >> /boot/grub/grub.conf
+ ln -s grub.conf $MNThdd/boot/grub/menu.lst
+fi
# request a reboot if pae is supported
if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2015-05-21 9:30 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150521093033.EE4E322385@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox