ソースを参照

Configure backports and contrib repo before update

Bob Mottram 8 年 前
コミット
e07c8eb2a5
コミット者のEメールアドレスに関連付けられたアカウントが存在しません
共有2 個のファイルを変更した14 個の追加9 個の削除を含む
  1. 2
    0
      src/freedombone-app-ipfs
  2. 12
    9
      src/freedombone-image-customise

+ 2
- 0
src/freedombone-app-ipfs ファイルの表示

206
         return
206
         return
207
     fi
207
     fi
208
 
208
 
209
+    chroot ${rootdir} apt-get -y install nodejs
209
     chroot ${rootdir} apt-get -y install npm
210
     chroot ${rootdir} apt-get -y install npm
210
     chroot ${rootdir} apt-get -y install libpam0g-dev fuse
211
     chroot ${rootdir} apt-get -y install libpam0g-dev fuse
211
 
212
 
273
         return
274
         return
274
     fi
275
     fi
275
 
276
 
277
+    apt-get -y install nodejs
276
     apt-get -y install npm
278
     apt-get -y install npm
277
     apt-get -y install libpam0g-dev fuse
279
     apt-get -y install libpam0g-dev fuse
278
 
280
 

+ 12
- 9
src/freedombone-image-customise ファイルの表示

116
 # Whether to enable zeronet on the mesh
116
 # Whether to enable zeronet on the mesh
117
 ENABLE_ZERONET=
117
 ENABLE_ZERONET=
118
 
118
 
119
+function configure_backports {
120
+    echo "deb http://${DEBIAN_REPO}/debian/ ${DEBIAN_VERSION}-backports main" >> $rootdir/etc/apt/sources.list
121
+}
122
+
123
+function configure_contrib_repo {
124
+    if ! grep -q "contrib" $rootdir/etc/apt/sources.list; then
125
+        chroot "$rootdir" sed -i "s| main| main contrib|g" /etc/apt/sources.list
126
+    fi
127
+}
128
+
119
 enable_eatmydata_override() {
129
 enable_eatmydata_override() {
120
     chroot $rootdir apt-get install --no-install-recommends -y eatmydata
130
     chroot $rootdir apt-get install --no-install-recommends -y eatmydata
121
     if [ -x $rootdir/usr/bin/eatmydata ] && \
131
     if [ -x $rootdir/usr/bin/eatmydata ] && \
530
             chroot "$rootdir" sed -i "s| main| main non-free|g" /etc/apt/sources.list
540
             chroot "$rootdir" sed -i "s| main| main non-free|g" /etc/apt/sources.list
531
         fi
541
         fi
532
 
542
 
533
-        # enable contrib repo
534
-        if ! grep -q "contrib" $rootdir/etc/apt/sources.list; then
535
-            chroot "$rootdir" sed -i "s| main| main contrib|g" /etc/apt/sources.list
536
-        fi
537
-
538
         chroot "$rootdir" apt-get update
543
         chroot "$rootdir" apt-get update
539
 
544
 
540
         # install proprietary wifi drivers
545
         # install proprietary wifi drivers
692
         DEBIAN_VERSION='jessie'
697
         DEBIAN_VERSION='jessie'
693
     fi
698
     fi
694
 
699
 
695
-    # install backports
696
-    echo "deb http://${DEBIAN_REPO}/debian/ ${DEBIAN_VERSION}-backports main" >> $rootdir/etc/apt/sources.list
697
-    chroot "$rootdir" apt-get -y update
698
-
699
     # desktop
700
     # desktop
700
     chroot "$rootdir" apt-get -y install mate-desktop-environment
701
     chroot "$rootdir" apt-get -y install mate-desktop-environment
701
 
702
 
837
 chroot "$rootdir" apt-get clean
838
 chroot "$rootdir" apt-get clean
838
 chroot "$rootdir" rm -rf /var/lib/apt/lists/*
839
 chroot "$rootdir" rm -rf /var/lib/apt/lists/*
839
 chroot "$rootdir" apt-get clean
840
 chroot "$rootdir" apt-get clean
841
+configure_backports
842
+configure_contrib_repo
840
 chroot "$rootdir" apt-get update
843
 chroot "$rootdir" apt-get update
841
 
844
 
842
 cat > $rootdir/usr/sbin/policy-rc.d <<EOF
845
 cat > $rootdir/usr/sbin/policy-rc.d <<EOF