[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. d4621fa0ab1b3d6170208e05d3306c016b179a61

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. d4621fa0ab1b3d6170208e05d3306c016b179a61

[git]

[-- Attachment #1: Type: text/plain, Size: 2945 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, thirteen has been updated
       via  d4621fa0ab1b3d6170208e05d3306c016b179a61 (commit)
       via  329c7bda00116f32e8b0c62b3c56319e0508a9ab (commit)
      from  86918e351d1e258f33cd6b7dc401a0c97488ac02 (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 d4621fa0ab1b3d6170208e05d3306c016b179a61
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Sep 26 14:51:55 2012 +0200

    zlib: fix /lib/libz.so symlink.
    
    netssleay use this instead of libz.so.1 ...

commit 329c7bda00116f32e8b0c62b3c56319e0508a9ab
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Sep 26 14:50:35 2012 +0200

    uboot: remove hardcoded video mode.
    
    32bit modes are now fixed in the omapfb driver so we can use autodetect again.

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

Summary of changes:
 config/rootfiles/common/zlib |    1 +
 config/u-boot/boot.scr       |  Bin 322 -> 290 bytes
 config/u-boot/boot.script    |    2 +-
 lfs/zlib                     |    2 ++
 4 files changed, 4 insertions(+), 1 deletions(-)

Difference in files:
diff --git a/config/rootfiles/common/zlib b/config/rootfiles/common/zlib
index 8c46843..9edc631 100644
--- a/config/rootfiles/common/zlib
+++ b/config/rootfiles/common/zlib
@@ -1,3 +1,4 @@
+lib/libz.so
 lib/libz.so.1
 lib/libz.so.1.2.7
 #usr/include/zconf.h
diff --git a/config/u-boot/boot.scr b/config/u-boot/boot.scr
index 784c121..aad40ae 100755
Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ
diff --git a/config/u-boot/boot.script b/config/u-boot/boot.script
index 795e60f..0f71815 100755
--- a/config/u-boot/boot.script
+++ b/config/u-boot/boot.script
@@ -1,4 +1,4 @@
 fatload mmc 0:1 0x80000000 uImage-ipfire-omap
 fatload mmc 0:1 0x81600000 uInit-ipfire-omap
-setenv bootargs vram=32M console=tty1 omapfb.mode=dvi:800x600MR-16(a)60 rootwait smsc95xx.macaddr=$usbethaddr root=/dev/mmcblk0p3 ro
+setenv bootargs vram=32M console=tty1 rootwait smsc95xx.macaddr=$usbethaddr root=/dev/mmcblk0p3 ro
 bootm 0x80000000 0x81600000
diff --git a/lfs/zlib b/lfs/zlib
index 5337c77..0a2977d 100644
--- a/lfs/zlib
+++ b/lfs/zlib
@@ -77,7 +77,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	mv -v /usr/lib/libz.so.$(VER) /lib/libz.so.$(VER)
 	ln -svf libz.so.$(VER) /lib/libz.so.1
+	ln -svf libz.so.$(VER) /lib/libz.so
 	rm -vf /usr/lib/libz.so.1
+	rm -vf /usr/lib/libz.so
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)


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