Merge branch 'master' of ssh://kiao.no-ip.info:443/~/attapu

4 files changed, 20 insertions, 10 deletions

diff --git a/acompiler/kernel-36-pae/.footprint b/acompiler/kernel-36-pae/.footprint
index 7617be47b..3753c9bf0 100644
--- a/acompiler/kernel-36-pae/.footprint
+++ b/acompiler/kernel-36-pae/.footprint
@@ -2724,7 +2724,7 @@ drwxr-xr-x	root/root	lib/modules/2.6.36-NuTyX/kernel/sound/usb/usx2y/
 lrwxrwxrwx	root/root	lib/modules/2.6.36-NuTyX/source -> /usr/src/linux-2.6.36
 drwxr-xr-x	root/root	root/
 drwxr-xr-x	root/root	root/bin/
--rwxr-xr--	root/root	root/bin/install-attapu.ash
+-rwxr-xr-x	root/root	root/bin/install-attapu.ash
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/src/
 drwxr-xr-x	root/root	usr/src/linux-2.6.36/
diff --git a/acompiler/kernel-36-pae/.md5sum b/acompiler/kernel-36-pae/.md5sum
index bd15c0e6f..fc80d1f49 100644
--- a/acompiler/kernel-36-pae/.md5sum
+++ b/acompiler/kernel-36-pae/.md5sum
@@ -1,6 +1,6 @@
 99efdf23cb9787767a94dc3240f5449b  config
 9182da73932b4cbc635414d6f0af02ca  config_64
-2492f02b9f4a88d19bd6c208ce98330f  install-attapu.ash
-6fa4813333d99bf5580b15980b4acc42  installtools-24102010.tar.gz
+9d17fd1c6e89e6c53e2517f2d1d6284c  install-attapu.1.ash
+4529aec34555a9cd0aec62fe766892e2  installtools-31102010.tar.gz
 61f3739a73afb6914cb007f37fb09b62  linux-2.6.36.tar.bz2
-fe7d856a5a25df09f839e9db156a77ae  nutyx-initrd-extra-10102010.tar.bz2
+e1432a49e8f7b03c276210729474988a  nutyx-initrd-extra-31102010.tar.bz2
diff --git a/acompiler/kernel-36-pae/Pkgfile b/acompiler/kernel-36-pae/Pkgfile
index c42df4af8..44bce6247 100644
--- a/acompiler/kernel-36-pae/Pkgfile
+++ b/acompiler/kernel-36-pae/Pkgfile
@@ -6,17 +6,27 @@
 name=kernel-36-pae
 version=2.6.36
 _BaseVersion=2.6.36
-release=2
+release=3
 PKGMK_NO_STRIP="yes"
-SCRIPT_VERSION="attapu"
-_extra=10102010
-_tools=24102010
+SCRIPT_VERSION="attapu.1"
+_extra=31102010
+_tools=31102010
 source=(http://www.kernel.org/pub/linux/kernel/v2.6/linux-${_BaseVersion}.tar.bz2 config_64 config\
         http://nutyx.meticul.eu/install-${SCRIPT_VERSION}.ash\
         http://nutyx.meticul.eu/files/nutyx-initrd-extra-${_extra}.tar.bz2\
         http://nutyx.meticul.eu/files/installtools-${_tools}.tar.gz)
 
 build(){
+for i in setup-install setup-mirroir
+do
+        sed -i "s|#INSTALL#|install-$SCRIPT_VERSION.ash|" \
+        nutyx-initrd-2009/rootfs/install/$i || exit 1
+done
+for i in main.txt functions setup-grub setup-grub
+do
+        sed -i "s|#VERSION#|MINI $SCRIPT_VERSION|g" \
+        nutyx-initrd-2009/rootfs/install/$i
+done
 # bzip2 -d patch-$version.bz2
 cd linux-${_BaseVersion}
 
@@ -71,7 +81,7 @@ mv $SRC/linux-${_BaseVersion}/vmlinux $PKG/usr/src/linux-${_BaseVersion}/
 mv $SRC/linux-${_BaseVersion}/Module.symvers $PKG/usr/src/linux-${_BaseVersion}/
 rm -r $PKG/lib/firmware
 mkdir -p $PKG/root/bin
-install -m754 $SRC/install-${SCRIPT_VERSION}.ash \
+install -m755 $SRC/install-${SCRIPT_VERSION}.ash \
         $PKG/root/bin/install-${SCRIPT_VERSION}.ash
 cd $SRC
 bsdtar -c "-J" -f $PKG/boot/nutyx-initrd.tar.xz nutyx-initrd-2009
diff --git a/acompiler/kernel-36-pae/post-install b/acompiler/kernel-36-pae/post-install
index d983076c3..03344d9a1 100644
--- a/acompiler/kernel-36-pae/post-install
+++ b/acompiler/kernel-36-pae/post-install
@@ -1,5 +1,5 @@
 version=2.6.36-NuTyX
-SCRIPT_VERSION="attapu"
+SCRIPT_VERSION="attapu.1"
 SRC=/tmp/work
 WDIR=$SRC/nutyx-initrd-2009
 depmod $version