tazinst rev 38

tazinst: install bzImage64
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Dec 06 10:13:14 2014 +0100 (2014-12-06)
parents 81e51336083b
children 928b3831f4ac
files Makefile installer.cgi slitaz-installer tazinst
line diff
     1.1 --- a/Makefile	Fri Oct 17 18:00:21 2014 +0200
     1.2 +++ b/Makefile	Sat Dec 06 10:13:14 2014 +0100
     1.3 @@ -75,9 +75,11 @@
     1.4  	@echo "Installing slitaz-installer into $(DESTDIR)$(PREFIX)/sbin..."
     1.5  	mkdir -p $(DESTDIR)$(PREFIX)/sbin
     1.6  	install -m 0755 slitaz-installer $(DESTDIR)$(PREFIX)/sbin
     1.7 +	-[ "$(VERSION)" ] && sed -i 's/^VERSION=["0-9].*/VERSION=$(VERSION)/' $(DESTDIR)$(PREFIX)/sbin/slitaz-installer
     1.8  	@echo "Installing installer.cgi into $(DESTDIR)$(TAZPANEL)..."
     1.9  	mkdir -p $(DESTDIR)$(TAZPANEL)/menu.d
    1.10  	install -m 0755 installer.cgi $(DESTDIR)$(TAZPANEL)
    1.11 +	-[ "$(VERSION)" ] && sed -i 's/^VERSION=["0-9].*/VERSION="$(VERSION)"/' $(DESTDIR)$(TAZPANEL)/installer.cgi
    1.12  	@echo "Installing installer.menu into $(DESTDIR)$(TAZPANEL)/menu.d..."
    1.13  	ln -s ../installer.cgi $(DESTDIR)$(TAZPANEL)/menu.d/installer.cgi
    1.14  	@echo "Installing config file into $(DESTDIR)/etc/slitaz..."
     2.1 --- a/installer.cgi	Fri Oct 17 18:00:21 2014 +0200
     2.2 +++ b/installer.cgi	Sat Dec 06 10:13:14 2014 +0100
     2.3 @@ -11,7 +11,7 @@
     2.4  # restricted path
     2.5  PATH="/usr/sbin:/usr/bin:/sbin:/bin"
     2.6  
     2.7 -VERSION=3.95
     2.8 +VERSION=3.96
     2.9  
    2.10  # Common functions from libtazpanel
    2.11  . lib/libtazpanel
     3.1 --- a/slitaz-installer	Fri Oct 17 18:00:21 2014 +0200
     3.2 +++ b/slitaz-installer	Sat Dec 06 10:13:14 2014 +0100
     3.3 @@ -12,7 +12,7 @@
     3.4  TAZINST_REQUIRED_VERSION="2.98"
     3.5  BACKLIST="SliTaz GNU/Linux installer"
     3.6  DIALOG=dialog
     3.7 -VERSION="3.95"
     3.8 +VERSION="3.96"
     3.9  
    3.10  #--------------
    3.11  # msgs section
     4.1 --- a/tazinst	Fri Oct 17 18:00:21 2014 +0200
     4.2 +++ b/tazinst	Sat Dec 06 10:13:14 2014 +0100
     4.3 @@ -1814,7 +1814,8 @@
     4.4  		log "$(gettext "Kernel name not found, falling back to:") $(uname -r)"
     4.5  	fi
     4.6  	mkdir -p $TARGET_ROOT/boot || error8
     4.7 -	cp $SOURCE_ROOT/boot/bzImage $TARGET_ROOT/boot/$KERNEL
     4.8 +	cp $SOURCE_ROOT/boot/bzImage $TARGET_ROOT/boot/$KERNEL 2> /dev/null ||
     4.9 +	cp $SOURCE_ROOT/boot/bzImage* $TARGET_ROOT/boot/$KERNEL
    4.10  	log "$(gettext "install_kernel:") $KERNEL"
    4.11  }
    4.12