From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c36da4cb06f15d1d6bb39ad7961b7efd2e15a18b
Date: Fri, 04 Jan 2013 23:56:21 +0100 [thread overview]
Message-ID: <20130104225622.8F55120111@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 5801 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, next has been updated
via c36da4cb06f15d1d6bb39ad7961b7efd2e15a18b (commit)
via eed187d68ba226aa60721b5edf1ce50fce8459e1 (commit)
from 8cb035bac87b663e871960b90a11b811923d51f9 (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 c36da4cb06f15d1d6bb39ad7961b7efd2e15a18b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Jan 4 23:55:08 2013 +0100
kernel: fix pae kernel uninstall.
we have not enough space to left older versions without cleanup at update.
commit eed187d68ba226aa60721b5edf1ce50fce8459e1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Jan 4 23:54:46 2013 +0100
kernel: update to 3.2.36.
-----------------------------------------------------------------------
Summary of changes:
lfs/linux | 6 +++---
src/paks/linux-pae/install.sh | 4 ++--
src/paks/linux-pae/uninstall.sh | 9 +++++++--
src/paks/linux-pae/update.sh | 5 ++---
4 files changed, 14 insertions(+), 10 deletions(-)
Difference in files:
diff --git a/lfs/linux b/lfs/linux
index 547ae9b..f8cd7d5 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> #
# #
# 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 #
@@ -24,7 +24,7 @@
include Config
-VER = 3.2.35
+VER = 3.2.36
RPI_PATCHES = linux-3.2.27-ada8b44
@@ -71,7 +71,7 @@ objects =$(DL_FILE) \
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
-$(DL_FILE)_MD5 = 4566af86b5ae8f9dfce2442ccac79cc3
+$(DL_FILE)_MD5 = 9b92ea2160a9a383fad7487b5cfd653b
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 966687ff27e450e04ff50e0da829dc00
install : $(TARGET)
diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh
index 59e17bf..ab74051 100644
--- a/src/paks/linux-pae/install.sh
+++ b/src/paks/linux-pae/install.sh
@@ -17,7 +17,7 @@
# 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-2011 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2013 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
@@ -54,7 +54,7 @@ fi
#
# backup grub.conf
#
-cp /boot/grub/grub.conf /boot/grub/grub-backup-$KVER-pae.conf
+cp /boot/grub/grub.conf /boot/grub/grub-backup-$KVER-pae_install.conf
#
# Add new Entry to grub.conf
#
diff --git a/src/paks/linux-pae/uninstall.sh b/src/paks/linux-pae/uninstall.sh
index 959fdb1..69c7e56 100644
--- a/src/paks/linux-pae/uninstall.sh
+++ b/src/paks/linux-pae/uninstall.sh
@@ -17,10 +17,15 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2010 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2013 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
remove_files
-#mv -f /boot/grub/grub-backup-2.6.32.*-pae.conf /boot/grub/grub.conf
+rm -rf /boot/ipfirerd-*-pae.img
+rm -rf /lib/modules/*-ipfire-pae
+cp /boot/grub/grub.conf /boot/grub/grub-backup-pae_uninstall.conf
+sed -i "/title IPFire (PAE-Kernel)/,+3d" /boot/grub/grub.conf
+grub-set-default 1
+sync && sync
diff --git a/src/paks/linux-pae/update.sh b/src/paks/linux-pae/update.sh
index 2878dfb..1ad1831 100644
--- a/src/paks/linux-pae/update.sh
+++ b/src/paks/linux-pae/update.sh
@@ -17,11 +17,10 @@
# 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-2011 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2013 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
-#Don't remove old pae kernel at update
-#./uninstall.sh
+./uninstall.sh
./install.sh
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2013-01-04 22:56 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=20130104225622.8F55120111@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