Browse Source

Different inadyn build

Bob Mottram 8 years ago
parent
commit
44bacbf3a2
1 changed files with 9 additions and 4 deletions
  1. 9
    4
      src/freedombone-image-customise

+ 9
- 4
src/freedombone-image-customise View File

@@ -977,9 +977,14 @@ function image_install_inadyn {
977 977
     cd $rootdir/root/build/inadyn
978 978
     git checkout $INADYN_COMMIT -b $INADYN_COMMIT
979 979
 
980
-    chroot "$rootdir" cd /root/build/inadyn && ./configure
981
-    chroot "$rootdir" cd /root/build/inadyn && USE_OPENSSL=1 make
982
-    chroot "$rootdir" cd /root/build/inadyn && make install
980
+    cd $rootdir/root/build/inadyn
981
+    echo '#!/bin/bash' > $rootdir/root/build/build_inadyn.sh
982
+    echo 'cd ~/build/inadyn' >> $rootdir/root/build/build_inadyn.sh
983
+    echo './configure' >> $rootdir/root/build/build_inadyn.sh
984
+    echo 'USE_OPENSSL=1 make' >> $rootdir/root/build/build_inadyn.sh
985
+    echo 'make install' >> $rootdir/root/build/build_inadyn.sh
986
+    chmod +x $rootdir/root/build/build_inadyn.sh
987
+    chroot "$rootdir" /root/build/build_inadyn.sh
983 988
     if [ ! -f $rootdir/usr/local/sbin/inadyn ]; then
984 989
         echo 'Failed to build inadyn'
985 990
         exit 6209356
@@ -1168,7 +1173,7 @@ function image_setup_utils {
1168 1173
     cd $rootdir/root/build/nginx_ensite
1169 1174
     git checkout $NGINX_ENSITE_COMMIT -b $NGINX_ENSITE_COMMIT
1170 1175
     echo "nginx-ensite commit:$NGINX_ENSITE_COMMIT" >> $rootdir/root/freedombone-completed.txt
1171
-    chroot "$rootdir" make install
1176
+    chroot "$rootdir" cd /root/build/nginx_ensite && make install
1172 1177
     if [ ! -f $rootdir/etc/pam.d/nginx ]; then
1173 1178
         echo '#%PAM-1.0' > $rootdir/etc/pam.d/nginx
1174 1179
         echo '@include common-auth' >> $rootdir/etc/pam.d/nginx