[git.ipfire.org] IPFire 2.x development tree branch, seventeen, updated. f2a7ec21e3abe4085ca113d7962bf60b150de7c6

[git.ipfire.org] IPFire 2.x development tree branch, seventeen, updated. f2a7ec21e3abe4085ca113d7962bf60b150de7c6

[git]

[-- Attachment #1: Type: text/plain, Size: 2623 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, seventeen has been updated
       via  f2a7ec21e3abe4085ca113d7962bf60b150de7c6 (commit)
       via  541fb9a8a1296676ef7d052dd975c5eac77d748f (commit)
      from  013153bc789728aea220c92d92918c6ff5dee8a1 (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 f2a7ec21e3abe4085ca113d7962bf60b150de7c6
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Oct 23 21:58:23 2014 +0200

    kernel: fix uInit ramdisk build.

commit 541fb9a8a1296676ef7d052dd975c5eac77d748f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Oct 23 21:57:36 2014 +0200

    glibc: fix build with new patches.

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

Summary of changes:
 lfs/glibc | 3 +++
 lfs/linux | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/lfs/glibc b/lfs/glibc
index ee332c4..194f556 100644
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -284,6 +284,9 @@ endif
 	#   Makefile:235: *** mixed implicit and normal rules.  Stop.
 	cd $(DIR_APP) && sed -i 's/ot \$$/ot:\n\ttouch $$@\n$$/' manual/Makefile
 
+	# http://sourceware.org/ml/libc-ports/2011-09/msg00018.html
+	cd $(DIR_APP) && sed -e "s/PIC/SHARED/g" -i ports/sysdeps/arm/{,eabi/}{set,__long}jmp.S
+
 ifeq "$(ROOT)" ""
 ifeq "$(MACHINE_TYPE)" "arm"
 	cd $(DIR_APP) && sed -i 's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.3 -o|' \
diff --git a/lfs/linux b/lfs/linux
index 501458d..f11bd5f 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -297,11 +297,11 @@ endif
 	dracut --force --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)-kirkwood.img uInit-ipfire-kirkwood
+	cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(VERSUFIX)
 endif
 
 ifeq "$(KCFG)" "-multi"
-	cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-multi.img uInit-ipfire-multi
+	cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(VERSUFIX)
 endif
 
 ifeq "$(LASTKERNEL)" "1"


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