Browse Source

Fixing image utils install

Bob Mottram 8 years ago
parent
commit
5e3a5215fa
1 changed files with 3 additions and 3 deletions
  1. 3
    3
      src/freedombone-image-customise

+ 3
- 3
src/freedombone-image-customise View File

1160
     git clone $TOMB_REPO $rootdir/root/build/tomb
1160
     git clone $TOMB_REPO $rootdir/root/build/tomb
1161
     cd $rootdir/root/build/tomb
1161
     cd $rootdir/root/build/tomb
1162
     git checkout $TOMB_COMMIT -b $TOMB_COMMIT
1162
     git checkout $TOMB_COMMIT -b $TOMB_COMMIT
1163
-    chroot "$rootdir" make install
1163
+    chroot "$rootdir" cd /root/build/tomb && make install
1164
     echo "tomb commit:$TOMB_COMMIT" >> $rootdir/root/freedombone-completed.txt
1164
     echo "tomb commit:$TOMB_COMMIT" >> $rootdir/root/freedombone-completed.txt
1165
 
1165
 
1166
     if ! grep '* hard maxsyslogins' $rootdir/etc/security/limits.conf; then
1166
     if ! grep '* hard maxsyslogins' $rootdir/etc/security/limits.conf; then
1193
     git clone $GPGIT_REPO $rootdir/root/build/gpgit
1193
     git clone $GPGIT_REPO $rootdir/root/build/gpgit
1194
     cd $rootdir/root/build/gpgit
1194
     cd $rootdir/root/build/gpgit
1195
     git checkout $GPGIT_COMMIT -b $GPGIT_COMMIT
1195
     git checkout $GPGIT_COMMIT -b $GPGIT_COMMIT
1196
-    cp gpgit.pl $rootdir/usr/bin
1196
+    cp $rootdir/root/build/gpgit/gpgit.pl $rootdir/usr/bin
1197
     echo "gpgit commit:$GPGIT_COMMIT" >> $rootdir/root/freedombone-completed.txt
1197
     echo "gpgit commit:$GPGIT_COMMIT" >> $rootdir/root/freedombone-completed.txt
1198
 
1198
 
1199
     # email client
1199
     # email client
1212
     cd $rootdir/root/build/nginx_ensite
1212
     cd $rootdir/root/build/nginx_ensite
1213
     git checkout $NGINX_ENSITE_COMMIT -b $NGINX_ENSITE_COMMIT
1213
     git checkout $NGINX_ENSITE_COMMIT -b $NGINX_ENSITE_COMMIT
1214
     echo "nginx-ensite commit:$NGINX_ENSITE_COMMIT" >> $rootdir/root/freedombone-completed.txt
1214
     echo "nginx-ensite commit:$NGINX_ENSITE_COMMIT" >> $rootdir/root/freedombone-completed.txt
1215
-    chroot "$rootdir" make install
1215
+    chroot "$rootdir" cd /root/build/nginx_ensite && make install
1216
     chroot "$rootdir" nginx_dissite default
1216
     chroot "$rootdir" nginx_dissite default
1217
     if [ ! -f $rootdir/etc/pam.d/nginx ]; then
1217
     if [ ! -f $rootdir/etc/pam.d/nginx ]; then
1218
         echo '#%PAM-1.0' > $rootdir/etc/pam.d/nginx
1218
         echo '#%PAM-1.0' > $rootdir/etc/pam.d/nginx