Testing eudev

Addons misc and acpid is optional now

docker/build.sh

@@ -29,14 +29,14 @@ for PLATFORM in ${!PLATFORMS[@]}; do
   else
     echo "OK"
   fi
-  echo -n "Checking cache/linux-${KVER}.tar.xz... "
+  # echo -n "Checking cache/linux-${KVER}.tar.xz... "
-  if [ ! -f "cache/linux-${KVER}.tar.xz" ]; then
+  # if [ ! -f "cache/linux-${KVER}.tar.xz" ]; then
-    URL="https://cdn.kernel.org/pub/linux/kernel/v${KVER:0:1}.x/linux-${KVER}.tar.xz"
+  #   URL="https://cdn.kernel.org/pub/linux/kernel/v${KVER:0:1}.x/linux-${KVER}.tar.xz"
-    echo "Downloading ${URL}"
+  #   echo "Downloading ${URL}"
-    curl -L "${URL}" -o "cache/linux-${KVER}.tar.xz"
+  #   curl -L "${URL}" -o "cache/linux-${KVER}.tar.xz"
-  else
+  # else
-    echo "OK"
+  #   echo "OK"
-  fi
+  # fi
 done
 
 # Generate Dockerfile

docker/files/opt/do.sh

@@ -43,28 +43,28 @@ function compile-lkm {
   mv "/tmp/input/redpill.ko" "/output/redpill-prod.ko"
 }
 
-function compile-drivers {
+# function compile-drivers {
-  while read platform kver; do
+#   while read platform kver; do
-    SRC_PATH="/opt/${platform}"
+#     SRC_PATH="/opt/${platform}"
-    echo "Compiling for ${platform}-${kver}"
+#     echo "Compiling for ${platform}-${kver}"
-    cd /opt/linux-${kver}/drivers
+#     cd /opt/linux-${kver}/drivers
-    while read dir; do
+#     while read dir; do
-      if [ -f "${dir}/Makefile" ]; then
+#       if [ -f "${dir}/Makefile" ]; then
-        echo "Driver `basename ${dir}`"
+#         echo "Driver `basename ${dir}`"
-        grep "CONFIG_.*/.*"   "${dir}/Makefile" | sed 's/.*\(CONFIG_[^)]*\).*/\1=n/g' >  /tmp/env
+#         grep "CONFIG_.*/.*"   "${dir}/Makefile" | sed 's/.*\(CONFIG_[^)]*\).*/\1=n/g' >  /tmp/env
-        grep "CONFIG_.*\.o.*" "${dir}/Makefile" | sed 's/.*\(CONFIG_[^)]*\).*/\1=m/g' >> /tmp/env
+#         grep "CONFIG_.*\.o.*" "${dir}/Makefile" | sed 's/.*\(CONFIG_[^)]*\).*/\1=m/g' >> /tmp/env
-        make -C "${SRC_PATH}" M=$(readlink -f "${dir}") clean
+#         make -C "${SRC_PATH}" M=$(readlink -f "${dir}") clean
-        cat /tmp/env | xargs -d '\n' make -C "${SRC_PATH}" M=$(readlink -f "${dir}") modules $@
+#         cat /tmp/env | xargs -d '\n' make -C "${SRC_PATH}" M=$(readlink -f "${dir}") modules $@
-      fi
+#       fi
-    done < <(find -type d)
+#     done < <(find -type d)
-    DST_PATH="/output/compiled-mods/${platform}-${kver}"
+#     DST_PATH="/output/compiled-mods/${platform}-${kver}"
-    mkdir -p "${DST_PATH}"
+#     mkdir -p "${DST_PATH}"
-    while read f; do
+#     while read f; do
-      strip -g "${f}"
+#       strip -g "${f}"
-      mv "${f}" "${DST_PATH}"
+#       mv "${f}" "${DST_PATH}"
-    done < <(find -name \*.ko)
+#     done < <(find -name \*.ko)
-  done </opt/platforms
+#   done </opt/platforms
-}
+# }
 
 if [ $# -lt 1 ]; then
   echo "Use: <command> (<params>)"
@@ -74,7 +74,7 @@ case $1 in
   bash) shift; bash -l $@ ;;
   compile-module) compile-module $2 ;;
   compile-lkm) compile-lkm $2 ;;
-  compile-drivers) compile-drivers ;;
+  # compile-drivers) compile-drivers ;;
   *) echo "Command not recognized: $1" ;;
 esac
 

files/board/arpl/kernel_defconfig

@@ -116,27 +116,63 @@ CONFIG_EFI_VARS=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_VIRTIO_BLK=m
 CONFIG_BLK_DEV_NVME=y
+CONFIG_VMWARE_VMCI=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_SPI_ATTRS=y
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
 CONFIG_SCSI_AIC79XX=m
 # CONFIG_AIC79XX_DEBUG_ENABLE is not set
 CONFIG_SCSI_AIC94XX=m
 CONFIG_SCSI_MVSAS=m
 CONFIG_SCSI_MVUMI=m
 CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_SAS=m
 CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPI3MR=m
+CONFIG_SCSI_SMARTPQI=m
 CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
+CONFIG_SCSI_UFS_DWC_TC_PCI=m
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_UFS_CDNS_PLATFORM=m
+CONFIG_SCSI_UFS_DWC_TC_PLATFORM=m
+CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_BUSLOGIC=m
+CONFIG_SCSI_MYRB=m
+CONFIG_SCSI_MYRS=m
 CONFIG_VMWARE_PVSCSI=m
+CONFIG_SCSI_SNIC=m
+CONFIG_SCSI_DMX3191D=m
 CONFIG_SCSI_ISCI=m
 CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_IPR=m
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_QEDI=m
+CONFIG_SCSI_DC395x=m
 CONFIG_SCSI_AM53C974=m
+CONFIG_SCSI_WD719X=m
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
 CONFIG_SCSI_VIRTIO=m
 CONFIG_SCSI_DH=y
 CONFIG_ATA=y
@@ -157,33 +193,56 @@ CONFIG_BLK_DEV_MD=y
 CONFIG_BLK_DEV_DM=y
 CONFIG_DM_MIRROR=y
 CONFIG_DM_ZERO=y
+CONFIG_FUSION=y
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_CTL=m
 CONFIG_NETDEVICES=y
+CONFIG_MACVLAN=m
+CONFIG_IPVLAN=m
+CONFIG_VXLAN=m
 CONFIG_NETCONSOLE=y
 CONFIG_VIRTIO_NET=m
 CONFIG_ET131X=m
 CONFIG_SLICOSS=m
 CONFIG_ACENIC=m
+CONFIG_ENA_ETHERNET=m
+CONFIG_AMD8111_ETH=m
+CONFIG_PCNET32=m
 CONFIG_AMD_XGBE=m
+CONFIG_AQTION=m
 CONFIG_ATL1=m
 CONFIG_ATL1E=m
 CONFIG_ATL1C=m
 CONFIG_ALX=m
+CONFIG_B44=m
+CONFIG_BCMGENET=m
 CONFIG_CNIC=m
 CONFIG_TIGON3=y
 CONFIG_BNX2X=m
+CONFIG_SYSTEMPORT=m
+CONFIG_BNXT=m
 CONFIG_BNA=m
+CONFIG_MACB=m
+CONFIG_THUNDER_NIC_PF=m
+CONFIG_THUNDER_NIC_VF=m
+CONFIG_LIQUIDIO=m
+CONFIG_LIQUIDIO_VF=m
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T3=m
 CONFIG_CHELSIO_T4=m
 CONFIG_CHELSIO_T4VF=m
-CONFIG_NET_TULIP=y
+CONFIG_ENIC=m
+CONFIG_CX_ECAT=m
+CONFIG_DNET=m
 CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
 CONFIG_BE2NET=m
+# CONFIG_NET_VENDOR_GOOGLE is not set
 CONFIG_HINIC=m
 CONFIG_E100=y
-CONFIG_E1000=y
+CONFIG_E1000=m
-CONFIG_E1000E=y
+CONFIG_E1000E=m
 CONFIG_IGB=m
 CONFIG_IGBVF=m
 CONFIG_IXGB=m
@@ -199,14 +258,22 @@ CONFIG_SKGE=m
 CONFIG_SKY2=y
 CONFIG_MLX4_EN=m
 CONFIG_MYRI10GE=m
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
 CONFIG_S2IO=m
 CONFIG_VXGE=m
+CONFIG_NFP=m
+CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_FORCEDETH=m
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_QLA3XXX=m
 CONFIG_QLCNIC=m
 CONFIG_NETXEN_NIC=m
 CONFIG_QED=m
+CONFIG_QEDE=m
 CONFIG_QCOM_EMAC=m
-CONFIG_R8169=m
+CONFIG_RMNET=m
 CONFIG_SXGBE_ETH=m
 CONFIG_SFC=m
 # CONFIG_SFC_MCDI_MON is not set
@@ -223,7 +290,36 @@ CONFIG_VIA_VELOCITY=m
 CONFIG_XILINX_AXI_EMAC=m
 CONFIG_XILINX_LL_TEMAC=m
 CONFIG_REALTEK_PHY=y
-# CONFIG_USB_NET_DRIVERS is not set
+CONFIG_USB_NET_DRIVERS=m
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SR9800=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+CONFIG_USB_NET_AQC111=m
+CONFIG_USB_RTL8153_ECM=m
 # CONFIG_WLAN is not set
 CONFIG_VMXNET3=m
 CONFIG_INPUT_EVDEV=y

files/board/arpl/make-img.sh

@@ -15,11 +15,11 @@ BOARD_PATH="${CONFIG_DIR}/board/arpl"
 
 echo "Creating image file"
 # Create image zeroed
-dd if="/dev/zero" of="${IMAGE_FILE}" bs=1M count=300 conv=sync 2>/dev/null
+dd if="/dev/zero" of="${IMAGE_FILE}" bs=1M count=350 conv=sync 2>/dev/null
 # Copy grub stage1 to image
 dd if="${BOARD_PATH}/grub.bin" of="${IMAGE_FILE}" conv=notrunc,sync 2>/dev/null
 # Create partitions on image
-echo -e "n\np\n\n\n+150M\nt\n\n0b\nn\np\n\n\n+50M\nn\np\n\n\n\nw" | fdisk "${IMAGE_FILE}" >/dev/null
+echo -e "n\np\n\n\n+150M\na\nt\n\n0b\nn\np\n\n\n+50M\nn\np\n\n\n\nw" | fdisk "${IMAGE_FILE}" >/dev/null
 
 # Force umount, ignore errors
 sudo umount "${BINARIES_DIR}/p1" 2>/dev/null || true

files/board/arpl/overlayfs/opt/arpl/boot.sh

@@ -106,7 +106,7 @@ while true; do
   if [ -n "${IP}" ]; then
     echo -e "\033[1;32m${IP}\033[0m"
     break
-  elif [ ${COUNT} -eq 8 ]; then
+  elif [ ${COUNT} -eq 15 ]; then
     echo -e "\033[1;31mERROR\033[0m"
     break
   fi

files/board/arpl/overlayfs/opt/arpl/include/consts.sh

@@ -16,6 +16,7 @@ ORI_RDGZ_FILE="${SLPART_PATH}/rd.gz"
 
 ADDONS_PATH="${CACHE_PATH}/addons"
 LKM_PATH="${CACHE_PATH}/lkms"
+MODULES_PATH="${CACHE_PATH}/modules"
 
 MODEL_CONFIG_PATH="/opt/arpl/model-configs"
 INCLUDE_PATH="/opt/arpl/include"

files/board/arpl/overlayfs/opt/arpl/menu.sh

@@ -62,6 +62,7 @@ function modelMenu() {
   while read M; do
     M="`basename ${M}`"
     M="${M::-4}"
+    PLATFORM=`readModelKey "${M}" "platform"`
     # Check id model is compatible with CPU
     COMPATIBLE=1
     for F in `readModelArray "${M}" "flags"`; do
@@ -70,13 +71,10 @@ function modelMenu() {
         break
       fi
     done
-    [ ${COMPATIBLE} -eq 1 ] && ITEMS+="${M} "
+    [ ${COMPATIBLE} -eq 1 ] && ITEMS+="${M} ${PLATFORM} "
   done < <(find "${MODEL_CONFIG_PATH}" -maxdepth 1 -name \*.yml | sort)
-  dialog --clear --no-items \
+  dialog --backtitle "`backtitle`" --menu "Choose the model" 0 0 0 \
-    --backtitle "`backtitle`" \
+    ${ITEMS} 2>${TMP_PATH}/resp
-    --menu "Choose the model" 0 0 0 \
-    ${ITEMS} \
-    2>${TMP_PATH}/resp
   [ $? -ne 0 ] && return
   resp=$(<${TMP_PATH}/resp)
   [ -z "${resp}" ] && return
@@ -91,8 +89,6 @@ function modelMenu() {
     # Delete old files
     rm -f "${ORI_ZIMAGE_FILE}" "${ORI_RDGZ_FILE}" "${MOD_ZIMAGE_FILE}" "${MOD_RDGZ_FILE}"
     DIRTY=1
-    # Remove addons
-    writeConfigKey "addons" "{}" "${USER_CONFIG_FILE}"
   fi
 }
 
@@ -677,7 +673,7 @@ function updateMenu() {
     dialog --backtitle "`backtitle`" --menu "Choose a option" 0 0 0 \
       a "Update arpl" \
       d "Update addons" \
-      l "Update LKMs" \
+      l "Update Modules/LKMs" \
       e "Exit" \
       2>${TMP_PATH}/resp
     [ $? -ne 0 ] && return
@@ -758,7 +754,20 @@ function updateMenu() {
         ;;
 
       l)
-        dialog --backtitle "`backtitle`" --title "Update LKMs" --aspect 18 \
+        unset PLATFORMS
+        declare -A PLATFORMS
+        while read M; do
+          M="`basename ${M}`"
+          MODEL="${M::-4}"
+          PLATFORM=`readModelKey "${MODEL}" "platform"`
+          ITEMS="`readConfigEntriesArray "builds" "${MODEL_CONFIG_PATH}/${MODEL}.yml"`"
+          for BUILD in ${ITEMS}; do
+            KVER=`readModelKey "${MODEL}" "builds.${BUILD}.kver"`
+            PLATFORMS["${PLATFORM}-${KVER}"]=""
+          done
+        done < <(find "${MODEL_CONFIG_PATH}" -maxdepth 1 -name \*.yml | sort)
+
+        dialog --backtitle "`backtitle`" --title "Update Modules/LKMs" --aspect 18 \
           --infobox "Checking last version" 0 0
         TAG=`curl --insecure -s https://api.github.com/repos/fbelavenuto/redpill-lkm/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}'`
         if [ $? -ne 0 -o -z "${TAG}" ]; then
@@ -766,19 +775,29 @@ function updateMenu() {
             --msgbox "Error checking new version" 0 0
           continue
         fi
-        dialog --backtitle "`backtitle`" --title "Update LKMs" --aspect 18 \
+        dialog --backtitle "`backtitle`" --title "Update Modules/LKMs" --aspect 18 \
           --infobox "Downloading last version" 0 0
         curl --insecure -s -L "https://github.com/fbelavenuto/redpill-lkm/releases/download/${TAG}/rp-lkms.zip" -o /tmp/rp-lkms.zip
         if [ $? -ne 0 ]; then
-          dialog --backtitle "`backtitle`" --title "Update LKMs" --aspect 18 \
+          dialog --backtitle "`backtitle`" --title "Update Modules/LKMs" --aspect 18 \
-            --msgbox "Error downloading new version" 0 0
+            --msgbox "Error downloading last version" 0 0
           continue
         fi
-        dialog --backtitle "`backtitle`" --title "Update LKMs" --aspect 18 \
+        for P in ${!PLATFORMS[@]}; do
+          curl --insecure -s -L "https://github.com/fbelavenuto/redpill-lkm/releases/download/${TAG}/${P}.tgz" -o "/tmp/${P}.tgz"
+          if [ $? -ne 0 ]; then
+            dialog --backtitle "`backtitle`" --title "Update Modules/LKMs" --aspect 18 \
+              --msgbox "Error downloading ${P}.tgz" 0 0
+            continue
+          fi
+          rm "${MODULES_PATH}/${P}.tgz"
+          mv "/tmp/${P}.tgz" "${MODULES_PATH}/${P}.tgz"
+        done
+        dialog --backtitle "`backtitle`" --title "Update Modules/LKMs" --aspect 18 \
           --infobox "Extracting last version" 0 0
-        rm -rf /mnt/p3/lkms/*
+        rm -rf "${LKM_PATH}/"*
-        unzip /tmp/rp-lkms.zip -d /mnt/p3/lkms >/dev/null 2>&1
+        unzip /tmp/rp-lkms.zip -d "${LKM_PATH}" >/dev/null 2>&1
-        dialog --backtitle "`backtitle`" --title "Update LKMs" --aspect 18 \
+        dialog --backtitle "`backtitle`" --title "Update Modules/LKMs" --aspect 18 \
           --msgbox "LKMs updated with success!" 0 0
         ;;
 

files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh

@@ -89,7 +89,7 @@ gzip -dc "${CACHE_PATH}/modules/${PLATFORM}-${KVER}.tgz" | tar xf - -C "${TMP_PA
 for F in `ls "${TMP_PATH}/modules/"*.ko`; do
   M=`basename ${F}`
   # Skip existent modules
-  [ -f "${RAMDISK_PATH}/lib/modules/${M}" ] || mv "${F}" "${RAMDISK_PATH}/lib/modules/${M}"
+  [ -f "${RAMDISK_PATH}/usr/lib/modules/${M}" ] || mv "${F}" "${RAMDISK_PATH}/usr/lib/modules/${M}"
 done
 # Clean
 rm -rf "${TMP_PATH}/modules"
@@ -108,8 +108,7 @@ cp "${LKM_PATH}/rp-${PLATFORM}-${KVER}-${LKM}.ko" "${RAMDISK_PATH}/usr/lib/modul
 DT="`readModelKey "${MODEL}" "dt"`"
 # Add system addon "dtbpatch" or "maxdisks"
 [ "${DT}" = "true" ] && ADDONS['dtbpatch']="" || ADDONS['maxdisks']=""
-ADDONS['misc']=""  # Add system addon "misc"
+# Indispensable eudev system addon
-ADDONS['acpid']=""  # Add system addon "acpid"
 ADDONS['eudev']=""
 
 echo -n "."