more void stuff

apertus-open-source-cinema · Mar 11, 2019 · 9f4bea8 · 9f4bea8
1 parent 5377421
commit 9f4bea8
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
diff --git a/boot/axiom-beta/uEnv.txt b/boot/axiom-beta/uEnv.txt
@@ -1,4 +1,4 @@
-bootargs=console=ttyPS0,115200n8 root=PARTUUID=f37043ff-02 rw rootfstype=ext4 rootwait systemd.log_level=warning loglevel=7 systemd.log_target=console kernel.sysrq=1 init=/usr/lib/systemd/systemd sdhci.debug_quirks=64 kernel.sysrq=1
+bootargs=console=ttyPS0,115200n8 root=PARTUUID=f37043ff-02 rw rootfstype=ext4 rootwait systemd.log_level=warning loglevel=7 systemd.log_target=console kernel.sysrq=1 init=/bin/init sdhci.debug_quirks=64 kernel.sysrq=1
 uenvcmd=fatload mmc 0 0x3000000 zImage; fatload mmc 0 0x2A00000 devicetree.dtb;fdt addr 0x2A00000; fdt resize; fdt rsvmem add 0x18000000 0x08000000; fdt rsvmem print; fdt print /chosen bootargs; bootz 0x3000000 - 0x2A00000
 ethaddr=00:0a:35:00:01:31
 bootdelay=0
diff --git a/boot/axiom-micro/uEnv.txt b/boot/axiom-micro/uEnv.txt
@@ -1,4 +1,4 @@
-bootargs=console=ttyPS0,115200n8 root=PARTUUID=f37043ff-02 rw rootfstype=ext4 rootwait systemd.log_level=warning loglevel=7 systemd.log_target=console kernel.sysrq=1 init=/usr/lib/systemd/systemd sdhci.debug_quirks=64 kernel.sysrq=1
+bootargs=console=ttyPS0,115200n8 root=PARTUUID=f37043ff-02 rw rootfstype=ext4 rootwait systemd.log_level=warning loglevel=7 systemd.log_target=console kernel.sysrq=1 init=/bin/init sdhci.debug_quirks=64 kernel.sysrq=1
 bootcmd=fatload mmc 0 0x4000000 bitstream.bit;fpga loadb 0 0x4000000 0x1FCC0C;fatload mmc 0 0x3000000 zImage;fatload mmc 0 0x2A00000 devicetree.dtb;fdt addr 0x2A00000; fdt resize; fdt rsvmem add 0xf800000 0x08000000; fdt rsvmem print; fdt print /chosen bootargs; bootz 0x3000000 - 0x2A00000
 ethaddr=00:0a:35:00:01:39
 bootdelay=0
diff --git a/makefiles/host/rootfs.mk b/makefiles/host/rootfs.mk
@@ -18,7 +18,7 @@ build/root.fs/opt/axiom-firmware/.install_stamp: $(shell find -type f -not -path
 
 build/root.fs/.base_install: build/$(LINUX_BASE_IMAGE)
 	mkdir -p $(@D)
-	tar -xJ -C $(@D) -f $<
+	tar xpf $< -C $(@D) --xattrs-include='*.*' --numeric-owner
 
 	touch $@
 

diff --git a/makefiles/in_chroot/install.sh b/makefiles/in_chroot/install.sh
@@ -5,6 +5,8 @@ DEVICE=$(cat /etc/hostname)
 cd /opt/axiom-firmware
 
 # install dependencies
+xbps-install -ySu 
+xbps-install -ySu
 xbps-install -yS $(grep -vE "^\s*#" makefiles/in_chroot/requirements_xbps.txt | tr "\n" " ") || [ $? -eq 6 ]
 pip install -r makefiles/in_chroot/requirements_pip.txt
 
@@ -44,24 +46,26 @@ for script in software/scripts/*.sh; do ln -sf $(pwd)/$script /usr/axiom/script/
 for script in software/scripts/*.py; do ln -sf $(pwd)/$script /usr/axiom/script/axiom-$(basename $script | sed "s/_/-/g"); done
 
 # build and install the control daemon
-(cd software/axiom-control-daemon/
-    [ -d build ] || mkdir -p build
-    cd build
-    cmake -G Ninja ..
-    ninja
-    ./install_daemon.sh
-)
+# (cd software/axiom-control-daemon/
+#     [ -d build ] || mkdir -p build
+#     cd build
+#     cmake -G Ninja ..
+#     ninja
+#     ./install_daemon.sh
+# )
 
 # configure lighttpd
 cp -f software/configs/lighttpd.conf /etc/lighttpd/lighttpd.conf
 # systemctl enable lighttpd
+mkdir -p /srv/http/
 cp -rf software/http/AXIOM-WebRemote/* /srv/http/
 
 # TODO: build the misc tools from: https://github.com/apertus-open-source-cinema/misc-tools-utilities/tree/master/raw2dng
 cdmake software/misc-tools-utilities/raw2dng
 
 # download prebuilt fpga binaries & select the default binary
 # also convert the bitstreams to the format expected by the linux kernel 
+mkdir -p /lib/firmware/
 mkdir -p /opt/bitstreams/
 BITSTREAMS="BETA/cmv_hdmi3_dual_60.bit BETA/cmv_hdmi3_dual_30.bit BETA/ICSP/icsp.bit check_pin10.bit check_pin20.bit"
 for bit in $BITSTREAMS; do
@@ -82,9 +86,12 @@ else
     true
 fi
 
+mkdir -p /etc/modules-load.d/
 echo "i2c-dev" > /etc/modules-load.d/i2c-dev.conf
 echo "ledtrig-heartbeat" > /etc/modules-load.d/ledtrig.conf
 
+ln -sf /etc/sv/agetty-console /etc/runit/runsvdir/default/
+
 # configure bash
 cp software/configs/bashrc /etc/bash.bashrc
 
@@ -97,8 +104,8 @@ if [ -d overlay ]; then
 fi
 
 # install /etc/issue generating service
-cp software/configs/gen_etc_issue.service /etc/systemd/system/
-systemctl enable gen_etc_issue.service
+# cp software/configs/gen_etc_issue.service /etc/systemd/system/
+# systemctl enable gen_etc_issue.service
 
 # generate the motd and indicate software version
 echo -e "\033[38;5;15m$(tput bold)$(figlet "AXIOM ${DEVICE^}")  $(tput sgr0)" > /etc/motd

diff --git a/makefiles/in_chroot/requirements_xbps.txt b/makefiles/in_chroot/requirements_xbps.txt
@@ -8,6 +8,7 @@ figlet
 wget
 hashdeep
 rsync
+libgomp-devel
 
 # dependencies of tools
 python