Raspi2-3_GenImage Commit - r107:24bc403c92a3 · Collaboration Tremplin des Sciences

Merge pull request #51 from svamberg/master...

drtyhlpr -

r107:24bc403c92a3

parent child

Context file:

r107:24bc403c92a3

README.md +4 -1

             ##### `KERNELSRC_CONFIG`=true
             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.
+            ##### `KERNELSRC_USRCONFIG`=""
+            Copy own config file to kernel `.config`. If `KERNEL_MENUCONFIG`=true then running after copy.
             ##### `KERNELSRC_PREBUILT`=false
-            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.
+            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.
             ##### `RPI_FIRMWARE_DIR`=""
             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.

bootstrap.d/13-kernel.sh +13 0

                   # Load default raspberry kernel configuration
                   make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" "${KERNEL_DEFCONFIG}"
+                  if [ ! -z "$KERNELSRC_USRCONFIG" ] ; then
+                    cp $KERNELSRC_USRCONFIG ${KERNEL_DIR}/.config
+                  fi
                   # Start menu-driven kernel configuration (interactive)
                   if [ "$KERNEL_MENUCONFIG" = true ] ; then
                     make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" menuconfig
               # Remove kernel sources
               if [ "$KERNEL_REMOVESRC" = true ] ; then
                 rm -fr "${KERNEL_DIR}"
+              else
+                #make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" oldconfig
+                make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" modules_prepare
+                #make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" mrproper
               fi
               if [ -n "$RPI_FIRMWARE_DIR" ] && [ -d "$RPI_FIRMWARE_DIR" ] ; then
             # Install sysctl.d configuration files
             install_readonly files/sysctl.d/81-rpi-vm.conf "${ETC_DIR}/sysctl.d/81-rpi-vm.conf"
+            # make symlinks
+            ln -sf "${KERNEL_DIR}" "${R}/lib/modules/${KERNEL_VERSION}/build"
+            ln -sf "${KERNEL_DIR}" "${R}/lib/modules/${KERNEL_VERSION}/source"

files/etc/rc.local +9 0

@@ -11,4 +11,13
11	#	11	#
12	# By default this script does nothing.	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	exit 0	23	exit 0

files/firstboot/25-create-resolv-symlink.sh +5 -2

             logger -t "rc.firstboot" "Creating /etc/resolv.conf symlink"
             # Check if systemd resolve directory exists
-            if [ ! -d "/run/systemd/resolve" ] ; then
+            if [ ! -d "/run/systemd/resolve" -a ! -e "/etc/resolv.conf" ] ; then
               systemctl enable systemd-resolved.service
               systemctl restart systemd-resolved.service
             fi
               touch /run/systemd/resolve/resolv.conf
             fi
-            # Create symlink to /etc/reolv.conf
+            # Create symlink to /etc/reolv.conf if not exists yet
+            if [ ! -e "/etc/resolv.conf" ] ; then
               ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf
+            fi

rpi23-gen-image.sh +1 -1

             APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils"
             # Packages required for bootstrapping
-            REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git"
+            REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc"
             MISSING_PACKAGES=""
             set +x

General Comments 0

Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant

No TODOs yet

	Dépôts
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages