Compare commits

..

No commits in common. "kernel-test" and "main" have entirely different histories.

3 changed files with 5 additions and 19 deletions

View File

@ -9,10 +9,10 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=UTC \
gettext xsltproc wget unzip python python3-distutils gettext xsltproc wget unzip python python3-distutils
# Board build parameters # Board build parameters
ENV OPENWRT_VERSION=23.05.2 ENV OPENWRT_VERSION=22.03.2
ENV OPENWRT_TARGET=bcm27xx ENV OPENWRT_TARGET=bcm27xx
ENV OPENWRT_DEVICE=bcm2711 ENV OPENWRT_DEVICE=bcm2711
ENV OPENWRT_CC=gcc-12.3.0_musl ENV OPENWRT_CC=gcc-11.2.0_musl
RUN mkdir /Downloads RUN mkdir /Downloads

View File

@ -34,17 +34,6 @@ sed -i "s/\(packages.git\)\^.*/\1;openwrt-${OPENWRT_BRANCH}/g" feeds.conf
make defconfig make defconfig
# Enable collectd network encryption # Enable collectd network encryption
echo "CONFIG_PACKAGE_COLLECTD_ENCRYPTED_NETWORK=y" >> .config echo "CONFIG_PACKAGE_COLLECTD_ENCRYPTED_NETWORK=y" >> .config
echo "CONFIG_KERNEL_HWMON=y" >> .config
echo "CONFIG_KERNEL_NVME_CORE=y" >> .config
echo "CONFIG_KERNEL_BLK_DEV_NVME=y" >> .config
echo "CONFIG_KERNEL_NVME_HWMON=y" >> .config
echo "CONFIG_KERNEL_NVME_MULTIPATH=n" >> .config
# Kernel
make kernel_oldconfig
make package/kernel/linux/clean
make package/kernel/linux/prepare
make package/kernel/linux/compile
${MAKE} package/i2c-tools/compile ${MAKE} package/i2c-tools/compile
make package/kmod-i2c-mux-pinctrl/compile make package/kmod-i2c-mux-pinctrl/compile
@ -52,8 +41,8 @@ make package/kmod-nvme/compile
make package/kmod-rtc-pcf85063/compile make package/kmod-rtc-pcf85063/compile
make package/nvme-cli/compile make package/nvme-cli/compile
make package/ansible-core/compile make package/ansible-core/compile
make -j1 V=s package/asterisk-chan-quectel/compile ${MAKE} package/asterisk-chan-quectel/compile
make -j1 V=s package/collectd/compile ${MAKE} package/collectd/compile
sdkdir=$(pwd) sdkdir=$(pwd)
cd ${pwd} cd ${pwd}
@ -117,7 +106,6 @@ PACKAGES="kmod-i2c-bcm2835 kmod-i2c-mux kmod-i2c-mux-pinctrl \
BOOTSOURCE=target/linux/${OPENWRT_TARGET}/image BOOTSOURCE=target/linux/${OPENWRT_TARGET}/image
BOOTCONFIG=${BOOTSOURCE}/config.txt BOOTCONFIG=${BOOTSOURCE}/config.txt
BOOTCMDLINE=${BOOTSOURCE}/cmdline.txt
KERNELSOURCE=build_dir/target-${PKG_ARCH}_musl/linux-${OPENWRT_TARGET}_${OPENWRT_DEVICE}/linux-5.10.146 KERNELSOURCE=build_dir/target-${PKG_ARCH}_musl/linux-${OPENWRT_TARGET}_${OPENWRT_DEVICE}/linux-5.10.146
OVERLAYSOURCE=${KERNELSOURCE}/arch/arm64/boot/dts/overlays OVERLAYSOURCE=${KERNELSOURCE}/arch/arm64/boot/dts/overlays
@ -155,7 +143,6 @@ make image PROFILE=${PROFILE} EXTRA_IMAGE_NAME="dualeth" \
sed -i "s|,i2c_csi_dsi||g" ${BOOTSOURCE}/current.txt sed -i "s|,i2c_csi_dsi||g" ${BOOTSOURCE}/current.txt
sed -i "s/CONFIG_TARGET_ROOTFS_PARTSIZE=.*/CONFIG_TARGET_ROOTFS_PARTSIZE=768/g" .config sed -i "s/CONFIG_TARGET_ROOTFS_PARTSIZE=.*/CONFIG_TARGET_ROOTFS_PARTSIZE=768/g" .config
#sed -i 's/root=\/dev\/mmcblk0p2/root=\/dev\/nvme0n1p2/' $BOOTCMDLINE
make image PROFILE=${PROFILE} EXTRA_IMAGE_NAME="waveshare" \ make image PROFILE=${PROFILE} EXTRA_IMAGE_NAME="waveshare" \
PACKAGES=" \ PACKAGES=" \
@ -174,7 +161,6 @@ git apply ${pwd}/patches/overlay-add.patch
popd popd
sed -i "s/CONFIG_TARGET_ROOTFS_PARTSIZE=.*/CONFIG_TARGET_ROOTFS_PARTSIZE=308/g" .config sed -i "s/CONFIG_TARGET_ROOTFS_PARTSIZE=.*/CONFIG_TARGET_ROOTFS_PARTSIZE=308/g" .config
#sed -i 's/root=\/dev\/nvme0n1p2/root=\/dev\/mmcblk0p2/' $BOOTCMDLINE
make image PROFILE=${PROFILE} EXTRA_IMAGE_NAME="sensing" \ make image PROFILE=${PROFILE} EXTRA_IMAGE_NAME="sensing" \
PACKAGES="${PACKAGES} asterisk \ PACKAGES="${PACKAGES} asterisk \

View File

@ -74,5 +74,5 @@ CONFIG_VERSION_MANUFACTURER=""
CONFIG_VERSION_MANUFACTURER_URL="" CONFIG_VERSION_MANUFACTURER_URL=""
CONFIG_VERSION_NUMBER="" CONFIG_VERSION_NUMBER=""
CONFIG_VERSION_PRODUCT="" CONFIG_VERSION_PRODUCT=""
CONFIG_VERSION_REPO="https://downloads.openwrt.org/releases/23.05.2" CONFIG_VERSION_REPO="https://downloads.openwrt.org/releases/22.03.2"
CONFIG_VERSION_SUPPORT_URL="" CONFIG_VERSION_SUPPORT_URL=""