Getting rid of top-level DTB

Signed-off-by: Roman Shaposhnik <[email protected]>

Author: rvs

Makefile

@@ -98,10 +98,8 @@ DEVICETREE_DTB_amd64=
 DEVICETREE_DTB_arm64=$(DIST)/dtb/eve.dtb
 DEVICETREE_DTB=$(DEVICETREE_DTB_$(ZARCH))
 
+CONF_FILES=$(shell ls -d $(CONF_DIR)/*)
 PART_SPEC_=efi conf imga
-# FIXME: this is the only rpi specific stuff left - we'll get rid of it soon
-CONF_FILES_FILTER_rpi=| grep -v conf/eve.dts
-CONF_FILES=$(shell ls -d $(CONF_DIR)/* $(CONF_FILES_FILTER_$(findstring rpi,$(HV))))
 PART_SPEC_rpi=boot conf imga
 PART_SPEC=$(PART_SPEC_$(findstring rpi,$(HV)))
 

pkg/kernel/Dockerfile

@@ -115,12 +115,20 @@ RUN unzip -d /tmp /tmp/xr.zip ;\
     make -C /linux INSTALL_MOD_PATH=/tmp/kernel-modules \
                    M=/tmp/xr_usb_serial_common_lnx-3.6-and-newer-pak \
          modules modules_install
+
+# Device Tree Blobs
+# FIXME: we will switch to a native make INSTALL_DTBS_PATH=/tmp/kernel-modules/boot/dtb dtbs_install at some point
+RUN if [ "$(uname -m)" = aarch64 ]; then \
+       mkdir -p /tmp/kernel-modules/boot/dtb/eve && \
+       ./scripts/dtc/dtc -O dtb -o /tmp/kernel-modules/boot/dtb/eve/eve.dtb -I dts /eve.dts ;\
+    fi
+
 # Package all the modules up
 RUN ( DVER=$(basename $(find /tmp/kernel-modules/lib/modules/ -mindepth 1 -maxdepth 1)) && \
       cd /tmp/kernel-modules/lib/modules/$DVER && \
       rm build source && \
       ln -s /usr/src/linux-headers-$DVER build ) && \
-    ( cd /tmp/kernel-modules && tar cf /out/kernel.tar lib )
+    ( cd /tmp/kernel-modules && tar cf /out/kernel.tar . )
 
 # Headers (userspace API)
 RUN mkdir -p /tmp/kernel-headers/usr && \

conf/eve.dts renamed to pkg/kernel/eve.dts

@@ -1,8 +1,7 @@
 FROM linuxkit/alpine:90571a1a9059f3bf33ca3431bc5396aa837a47d3
 RUN apk add --no-cache \
   mtools=4.0.18-r2     \
-  dosfstools=4.1-r1    \
-  dtc=1.4.4-r0
+  dosfstools=4.1-r1
 COPY make-config /
 RUN mkdir -p /conf/raw
 

pkg/mkconf/Dockerfile

@@ -13,12 +13,6 @@ CONFIG_SIZE_KB=1024
 # Traverse /conf to a point where we either see multiple files or no subdirectories
 (cd /conf; while cd "$(echo ./*)" >/dev/null 2>&1 ; do true ; done ; cp -r ./* /conf ; rm -rf /conf/raw)
 
-DTS=/conf/eve.dts
-if [ -f "$DTS" ]; then
-   [ "$ZARCH" = arm64 ] && dtc -O dtb -o /conf/eve.dtb -I dts "$DTS"
-   rm "$DTS"
-fi
-
 #
 # Create Config image
 #

pkg/mkconf/make-config

@@ -116,12 +116,16 @@ RUN unzip -d /tmp /tmp/xr.zip ;\
     make -C /linux INSTALL_MOD_PATH=/tmp/kernel-modules \
                    M=/tmp/xr_usb_serial_common_lnx-3.6-and-newer-pak \
          modules modules_install
+
+# Device Tree Blobs
+RUN if [ "$(uname -m)" = aarch64 ];then make INSTALL_DTBS_PATH=/tmp/kernel-modules/boot/dtb dtbs_install ;fi
+
 # Package all the modules up
 RUN ( DVER=$(basename $(find /tmp/kernel-modules/lib/modules/ -mindepth 1 -maxdepth 1)) && \
       cd /tmp/kernel-modules/lib/modules/$DVER && \
       rm build source && \
       ln -s /usr/src/linux-headers-$DVER build ) && \
-    ( cd /tmp/kernel-modules && tar cf /out/kernel.tar lib )
+    ( cd /tmp/kernel-modules && tar cf /out/kernel.tar . )
 
 # Headers (userspace API)
 RUN mkdir -p /tmp/kernel-headers/usr && \