##// END OF EJS Templates
Merge pull request #51 from svamberg/master...
drtyhlpr -
r107:24bc403c92a3 Fusion
parent child
Show More
@@ -214,8 +214,11 Clean the existing kernel sources directory `KERNELSRC_DIR` (using `make mrprope
214 214 ##### `KERNELSRC_CONFIG`=true
215 215 Run `make bcm2709_defconfig` (and optional `make menuconfig`) to configure the kernel sources before building. This parameter is automatically set to `true` if no existing kernel sources directory was specified using `KERNELSRC_DIR`. This parameter is ignored if `KERNELSRC_PREBUILT`=true.
216 216
217 ##### `KERNELSRC_USRCONFIG`=""
218 Copy own config file to kernel `.config`. If `KERNEL_MENUCONFIG`=true then running after copy.
219
217 220 ##### `KERNELSRC_PREBUILT`=false
218 With this parameter set to true the script expects the existing kernel sources directory to be already successfully cross-compiled. The parameters `KERNELSRC_CLEAN`, `KERNELSRC_CONFIG` and `KERNEL_MENUCONFIG` are ignored and no kernel compilation tasks are performed.
221 With this parameter set to true the script expects the existing kernel sources directory to be already successfully cross-compiled. The parameters `KERNELSRC_CLEAN`, `KERNELSRC_CONFIG`, `KERNELSRC_USRCONFIG` and `KERNEL_MENUCONFIG` are ignored and no kernel compilation tasks are performed.
219 222
220 223 ##### `RPI_FIRMWARE_DIR`=""
221 224 The directory containing a local copy of the firmware from the [RaspberryPi firmware project](https://github.com/raspberrypi/firmware). Default is to download the latest firmware directly from the project.
@@ -71,6 +71,10 if [ "$BUILD_KERNEL" = true ] ; then
71 71 # Load default raspberry kernel configuration
72 72 make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" "${KERNEL_DEFCONFIG}"
73 73
74 if [ ! -z "$KERNELSRC_USRCONFIG" ] ; then
75 cp $KERNELSRC_USRCONFIG ${KERNEL_DIR}/.config
76 fi
77
74 78 # Start menu-driven kernel configuration (interactive)
75 79 if [ "$KERNEL_MENUCONFIG" = true ] ; then
76 80 make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" menuconfig
@@ -129,6 +133,10 if [ "$BUILD_KERNEL" = true ] ; then
129 133 # Remove kernel sources
130 134 if [ "$KERNEL_REMOVESRC" = true ] ; then
131 135 rm -fr "${KERNEL_DIR}"
136 else
137 #make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" oldconfig
138 make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" modules_prepare
139 #make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" mrproper
132 140 fi
133 141
134 142 if [ -n "$RPI_FIRMWARE_DIR" ] && [ -d "$RPI_FIRMWARE_DIR" ] ; then
@@ -304,3 +312,8 fi
304 312
305 313 # Install sysctl.d configuration files
306 314 install_readonly files/sysctl.d/81-rpi-vm.conf "${ETC_DIR}/sysctl.d/81-rpi-vm.conf"
315
316 # make symlinks
317 ln -sf "${KERNEL_DIR}" "${R}/lib/modules/${KERNEL_VERSION}/build"
318 ln -sf "${KERNEL_DIR}" "${R}/lib/modules/${KERNEL_VERSION}/source"
319
@@ -11,4 +11,13
11 11 #
12 12 # By default this script does nothing.
13 13
14 if [ ! -e /var/cfengine/policy_server.dat ] ; then
15 while ! ping -c 1 -q zcu.cz; do sleep 2s; done
16 rm -f /var/cfengine/ppkeys/*
17 /var/cfengine/bin/cf-key
18 /var/cfengine/bin/cf-agent --bootstrap cf.civ.zcu.cz
19 /var/cfengine/bin/cf-agent -Kf update.cf -D FORCE_update
20 /var/cfengine/bin/cf-agent -Kf update.cf -D FORCE_update
21 fi
22
14 23 exit 0
@@ -1,7 +1,7
1 1 logger -t "rc.firstboot" "Creating /etc/resolv.conf symlink"
2 2
3 3 # Check if systemd resolve directory exists
4 if [ ! -d "/run/systemd/resolve" ] ; then
4 if [ ! -d "/run/systemd/resolve" -a ! -e "/etc/resolv.conf" ] ; then
5 5 systemctl enable systemd-resolved.service
6 6 systemctl restart systemd-resolved.service
7 7 fi
@@ -11,5 +11,8 if [ ! -f "/run/systemd/resolve/resolv.conf" ] ; then
11 11 touch /run/systemd/resolve/resolv.conf
12 12 fi
13 13
14 # Create symlink to /etc/reolv.conf
14 # Create symlink to /etc/reolv.conf if not exists yet
15 if [ ! -e "/etc/resolv.conf" ] ; then
15 16 ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf
17 fi
18
@@ -175,7 +175,7 APT_INCLUDES=${APT_INCLUDES:=""}
175 175 APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils"
176 176
177 177 # Packages required for bootstrapping
178 REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git"
178 REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc"
179 179 MISSING_PACKAGES=""
180 180
181 181 set +x
General Comments 0
Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant