##// END OF EJS Templates
Removed ENABLE_SYSTEMD(=false)
Jan Wagner -
r14:f33a610b0e30
parent child
Show More
@@ -53,7 +53,6 ENABLE_CONSOLE=${ENABLE_CONSOLE:=true}
53 ENABLE_IPV6=${ENABLE_IPV6:=true}
53 ENABLE_IPV6=${ENABLE_IPV6:=true}
54 ENABLE_SSHD=${ENABLE_SSHD:=true}
54 ENABLE_SSHD=${ENABLE_SSHD:=true}
55 ENABLE_SOUND=${ENABLE_SOUND:=true}
55 ENABLE_SOUND=${ENABLE_SOUND:=true}
56 ENABLE_SYSTEMD=${ENABLE_SYSTEMD:=true}
57 ENABLE_DBUS=${ENABLE_DBUS:=true}
56 ENABLE_DBUS=${ENABLE_DBUS:=true}
58 ENABLE_HWRANDOM=${ENABLE_HWRANDOM:=true}
57 ENABLE_HWRANDOM=${ENABLE_HWRANDOM:=true}
59 ENABLE_MINGPU=${ENABLE_MINGPU:=false}
58 ENABLE_MINGPU=${ENABLE_MINGPU:=false}
@@ -75,7 +74,7 REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static dosfstool
75 MISSING_PACKAGES=""
74 MISSING_PACKAGES=""
76
75
77 # Packages required in the chroot build enviroment
76 # Packages required in the chroot build enviroment
78 APT_INCLUDES="apt-transport-https,ca-certificates,debian-archive-keyring,dialog,locales,apt-utils,vim-tiny"
77 APT_INCLUDES="apt-transport-https,ca-certificates,debian-archive-keyring,dialog,locales"
79
78
80 set +x
79 set +x
81
80
@@ -121,11 +120,6 trap cleanup 0 1 2 3 6
121 # Set up chroot directory
120 # Set up chroot directory
122 mkdir -p $R
121 mkdir -p $R
123
122
124 # Use traditional SystemV init instead of systemd services
125 if [ "$ENABLE_SYSTEMD" = false ] ; then
126 APT_INCLUDES="${APT_INCLUDES},sysvinit-core"
127 fi
128
129 # Add dbus package, recommended if using systemd
123 # Add dbus package, recommended if using systemd
130 if [ "$ENABLE_DBUS" = true ] ; then
124 if [ "$ENABLE_DBUS" = true ] ; then
131 APT_INCLUDES="${APT_INCLUDES},dbus"
125 APT_INCLUDES="${APT_INCLUDES},dbus"
@@ -159,11 +153,6 fi
159 debootstrap --arch=armhf --foreign --include=${APT_INCLUDES} $RELEASE $R ${APT_PROXY}${APT_SERVER}/debian
153 debootstrap --arch=armhf --foreign --include=${APT_INCLUDES} $RELEASE $R ${APT_PROXY}${APT_SERVER}/debian
160 cp /usr/bin/qemu-arm-static $R/usr/bin
154 cp /usr/bin/qemu-arm-static $R/usr/bin
161
155
162 # Remove systemd related packages from list of packages to be bootstrapped
163 if [ "$ENABLE_SYSTEMD" = false ] ; then
164 chroot $R sed -i -e 's/systemd systemd-sysv //g' /debootstrap/required
165 fi
166
167 # Copy debian-archive-keyring.pgp
156 # Copy debian-archive-keyring.pgp
168 chroot $R mkdir -p /usr/share/keyrings
157 chroot $R mkdir -p /usr/share/keyrings
169 cp /usr/share/keyrings/debian-archive-keyring.gpg $R/usr/share/keyrings/debian-archive-keyring.gpg
158 cp /usr/share/keyrings/debian-archive-keyring.gpg $R/usr/share/keyrings/debian-archive-keyring.gpg
General Comments 0
Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant