Przeglądaj źródła

Testing different install

Bob Mottram 8 lat temu
rodzic
commit
cce9ee9123
2 zmienionych plików z 28 dodań i 27 usunięć
  1. 13
    13
      Makefile
  2. 15
    14
      src/freedombone-image-customise

+ 13
- 13
Makefile Wyświetl plik

@@ -24,16 +24,16 @@ install:
24 24
 	mkdir -p ${DESTDIR}/usr/share/${APP}/avatars
25 25
 	mkdir -p ${DESTDIR}/etc/${APP}
26 26
 	cp -r image_build/* ${DESTDIR}/etc/${APP}
27
-	install -m 755 img/backgrounds/${APP}_*.png ${DESTDIR}${PREFIX}/share
28
-	install -m 755 img/avatars/* ${DESTDIR}/usr/share/${APP}/avatars
29
-	install -m 755 src/* ${DESTDIR}${PREFIX}/bin
30
-	install -m 755 src/${APP}-meshweb ${DESTDIR}${PREFIX}/bin/meshweb
31
-	install -m 755 src/${APP}-controlpanel ${DESTDIR}${PREFIX}/bin/control
32
-	install -m 755 src/${APP}-mesh-batman ${DESTDIR}${PREFIX}/bin/batman
33
-	install -m 755 src/${APP}-backup-local ${DESTDIR}${PREFIX}/bin/backup
34
-	install -m 755 src/${APP}-backup-local ${DESTDIR}${PREFIX}/bin/backup2friends
35
-	install -m 755 src/${APP}-restore-local ${DESTDIR}${PREFIX}/bin/restore
36
-	install -m 755 src/${APP}-restore-remote ${DESTDIR}${PREFIX}/bin/restorefromfriend
27
+	cp img/backgrounds/${APP}_*.png ${DESTDIR}${PREFIX}/share
28
+	cp img/avatars/* ${DESTDIR}/usr/share/${APP}/avatars
29
+	cp src/* ${DESTDIR}${PREFIX}/bin
30
+	cp src/${APP}-meshweb ${DESTDIR}${PREFIX}/bin/meshweb
31
+	cp src/${APP}-controlpanel ${DESTDIR}${PREFIX}/bin/control
32
+	cp src/${APP}-mesh-batman ${DESTDIR}${PREFIX}/bin/batman
33
+	cp src/${APP}-backup-local ${DESTDIR}${PREFIX}/bin/backup
34
+	cp src/${APP}-backup-local ${DESTDIR}${PREFIX}/bin/backup2friends
35
+	cp src/${APP}-restore-local ${DESTDIR}${PREFIX}/bin/restore
36
+	cp src/${APP}-restore-remote ${DESTDIR}${PREFIX}/bin/restorefromfriend
37 37
 	rm -f ${DESTDIR}/usr/share/${APP}/base/*
38 38
 	rm -f ${DESTDIR}/usr/share/${APP}/apps/*
39 39
 	rm -f ${DESTDIR}/usr/share/${APP}/utils/*
@@ -41,9 +41,9 @@ install:
41 41
 	mv ${DESTDIR}${PREFIX}/bin/${APP}-app-* ${DESTDIR}/usr/share/${APP}/apps
42 42
 	mv ${DESTDIR}${PREFIX}/bin/${APP}-utils-* ${DESTDIR}/usr/share/${APP}/utils
43 43
 	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/man/man1
44
-	install -m 644 man/*.1.gz ${DESTDIR}${PREFIX}/share/man/man1
45
-	install -m 644 man/${APP}-backup-local.1.gz ${DESTDIR}${PREFIX}/share/man/man1/backup.1.gz
46
-	install -m 644 man/${APP}-restore-local.1.gz ${DESTDIR}${PREFIX}/share/man/man1/restore.1.gz
44
+	cp man/*.1.gz ${DESTDIR}${PREFIX}/share/man/man1
45
+	cp man/${APP}-backup-local.1.gz ${DESTDIR}${PREFIX}/share/man/man1/backup.1.gz
46
+	cp man/${APP}-restore-local.1.gz ${DESTDIR}${PREFIX}/share/man/man1/restore.1.gz
47 47
 	bash -c "./translate install"
48 48
 uninstall:
49 49
 	rm -f ${PREFIX}/share/${APP}_*.png

+ 15
- 14
src/freedombone-image-customise Wyświetl plik

@@ -958,18 +958,18 @@ chroot "$rootdir" adduser --gecos $username --disabled-password $username
958 958
 echo $username:$password | chroot "$rootdir" /usr/sbin/chpasswd
959 959
 chroot "$rootdir" adduser $username sudo
960 960
 
961
-#case "$MACHINE" in
962
-#    virtualbox)
963
-#        # hide irrelevant console keyboard messages.
964
-#        echo "echo \"4 4 1 7\" > /proc/sys/kernel/printk" \
965
-#             >> /etc/init.d/rc.local
966
-#        ;;
967
-#    qemu)
968
-#        # hide irrelevant console keyboard messages.
969
-#        echo "echo \"4 4 1 7\" > /proc/sys/kernel/printk" \
970
-#             >> /etc/init.d/rc.local
971
-#        ;;
972
-#esac
961
+case "$MACHINE" in
962
+    virtualbox)
963
+        # hide irrelevant console keyboard messages.
964
+        echo "echo \"4 4 1 7\" > /proc/sys/kernel/printk" \
965
+             >> /etc/init.d/rc.local
966
+        ;;
967
+    qemu)
968
+        # hide irrelevant console keyboard messages.
969
+        echo "echo \"4 4 1 7\" > /proc/sys/kernel/printk" \
970
+             >> /etc/init.d/rc.local
971
+        ;;
972
+esac
973 973
 
974 974
 if [ ! $DEBIAN_REPO ]; then
975 975
     DEBIAN_REPO='ftp.de.debian.org'
@@ -986,6 +986,7 @@ set_apt_sources $MIRROR
986 986
 configure_backports
987 987
 configure_contrib_repo
988 988
 chroot "$rootdir" apt-get update
989
+chroot "$rootdir" apt-get install -y apt-utils
989 990
 
990 991
 cat > $rootdir/usr/sbin/policy-rc.d <<EOF
991 992
 #!/bin/sh
@@ -1010,9 +1011,9 @@ chroot "$rootdir" apt-get install -y sudo git dialog toilet build-essential
1010 1011
 chroot "$rootdir" apt-get install -y avahi-daemon avahi-utils avahi-discover avahi-autoipd
1011 1012
 chroot "$rootdir" apt-get install -y iptables dnsutils net-tools network-manager iputils-ping
1012 1013
 chroot "$rootdir" apt-get install -y libnss-mdns libnss-myhostname libnss-gw-name nano man ntp
1013
-chroot "$rootdir" apt-get install -y locales locales-all debconf wireless-tools wpasupplicant
1014
-chroot "$rootdir" apt-get install -y usbutils cryptsetup zsh pinentry-curses iotop bc
1014
+chroot "$rootdir" apt-get install -y locales locales-all debconf wireless-tools wpasupplicant usbutils
1015 1015
 if [[ $ARCHITECTURE == 'qemu'* || $ARCHITECTURE == 'i386' || $ARCHITECTURE == 'i686' || $ARCHITECTURE == 'amd64' || $ARCHITECTURE == 'x86_64' ]]; then
1016
+    chroot "$rootdir" apt-get install -y cryptsetup zsh pinentry-curses iotop bc
1016 1017
     chroot "$rootdir" apt-get install -y grub2
1017 1018
 fi
1018 1019