[Lunar-commits] <lunar-iso> Added support for different ld.so versions

[Peter de Ridder]

commit c77f006932131a499e21bb027211d826fbdfca81
Author: Peter de Ridder <peter at lunar-linux.org>
Date: Sun, 07 Oct 2012 12:28:53 -0700
URL: https://github.com/lunar-linux/lunar-iso/commit/c77f006932131a499e21bb027211d826fbdfca81

Added support for different ld.so versions
---
  Makefile          | +6/-0     
  mkfiles/stage1.mk | +1/-1     
  2 files changed, 7 insertions(+), 1 deletion(-)

--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,12 @@ include conf/config
 
 ###ISO_KSUFFIX = $(shell if echo $(ISO_KVER) | grep -q "^2\.6\." ; then echo 2.6 ; else echo 2.4 ; fi ;)
 
+ifeq ($(ISO_GCCARCH),x86-64)
+  ISO_LD_LINUX = ld-linux-$(ISO_GCCARCH).so.2
+else
+  ISO_LD_LINUX = ld-linux.so.2
+endif
+
 # define the location where the ISO will be generated
 ISO_TARGET = $(ISO_SOURCE)/BUILD
 
--- a/mkfiles/stage1.mk
+++ b/mkfiles/stage1.mk
@@ -51,7 +51,7 @@ $(ISO_SOURCE)/cache/.stage1: stage1-build
 	@echo stage1-cache
 	@rm -rf $(ISO_SOURCE)/cache
 	@cp -r $(ISO_TARGET)/var/cache/lunar $(ISO_SOURCE)/cache
-	@tar -cjf $(ISO_SOURCE)/cache/fixup-$(ISO_BUILD).tar.bz2 -C $(ISO_TARGET) lib/ld-linux.so.2 lib/ld-linux-x86-64.so.2 lib/libc.so.6 lib/libdl.so.2 lib/libm.so.6 lib/librt.so.1 lib/libpthread.so.0 lib/libnss_files.so.2 lib/libutil.so.1 lib/libnsl.so.1 lib/libcrypt.so.1
+	@tar -cjf $(ISO_SOURCE)/cache/fixup-$(ISO_BUILD).tar.bz2 -C $(ISO_TARGET) lib/$(ISO_LD_LINUX) lib/libc.so.6 lib/libdl.so.2 lib/libm.so.6 lib/librt.so.1 lib/libpthread.so.0 lib/libnss_files.so.2 lib/libutil.so.1 lib/libnsl.so.1 lib/libcrypt.so.1
 	@touch $@
 
 stage1-cache: $(ISO_SOURCE)/cache/.stage1