use env params and cat dhd build log

arm64-builder · Nov 9, 2020 · 4b00091 · 4b00091
1 parent dcd0b46
commit 4b00091
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/build-rpm.sh b/build-rpm.sh
@@ -9,11 +9,11 @@ sudo chown -R nemo:nemo $ANDROID_ROOT
 cd $ANDROID_ROOT
 
 cd ~/.scratchbox2
-cp -R SailfishOS-*-armv7hl $VENDOR-$DEVICE-$PORT_ARCH
+cp -R SailfishOS-*-$PORT_ARCH $VENDOR-$DEVICE-$PORT_ARCH
 cd $VENDOR-$DEVICE-$PORT_ARCH
-sed -i "s/SailfishOS-$SAILFISH_VERSION/xiaomi-vince/g" sb2.config
-sudo ln -s /srv/mer/targets/SailfishOS-$SAILFISH_VERSION-armv7hl /srv/mer/targets/xiaomi-vince-armv7hl
-sudo ln -s /srv/mer/toolings/SailfishOS-$SAILFISH_VERSION /srv/mer/toolings/xiaomi-vince
+sed -i "s/SailfishOS-$SAILFISH_VERSION/$VENDOR-$DEVICE/g" sb2.config
+sudo ln -s /srv/mer/targets/SailfishOS-$SAILFISH_VERSION-$PORT_ARCH /srv/mer/targets/$VENDOR-$DEVICE-$PORT_ARCH
+sudo ln -s /srv/mer/toolings/SailfishOS-$SAILFISH_VERSION /srv/mer/toolings/$VENDOR-$DEVICE
 
 # 3.3.0.16 hack
 sb2 -t $VENDOR-$DEVICE-$PORT_ARCH -m sdk-install -R chmod 777 /boot
@@ -35,3 +35,5 @@ mv hybris/mw/droidmedia-$DROIDMEDIA_VERSION.tgz hybris/mw/droidmedia-localbuild
 rpm/dhd/helpers/build_packages.sh --build=hybris/mw/droidmedia-localbuild
 
 rpm/dhd/helpers/build_packages.sh --droid-hal
+
+cat /home/nemo/work/hadk_14.1/droid-hal-$DEVICE.log