From fd034d533f919b714185e2436a7994d0c23b8be7 Mon Sep 17 00:00:00 2001 From: matt Date: Mon, 6 Jan 2025 23:39:07 +0000 Subject: [PATCH 1/5] test version fix --- updater/base_buster_arm7.Pifile | 2 ++ updater/base_buster_armhf.Pifile | 2 ++ updater/version.Pifile | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 updater/version.Pifile diff --git a/updater/base_buster_arm7.Pifile b/updater/base_buster_arm7.Pifile index ccd7b21..3c67ff7 100644 --- a/updater/base_buster_arm7.Pifile +++ b/updater/base_buster_arm7.Pifile @@ -62,3 +62,5 @@ wget https://github.com/opencardev/prebuilts/raw/master/qt5/Qt_5151_armv7l_OpenG cat Qt_5151_armv7l_OpenGLES2.tar.xz* > Qt5_OpenGLES2.tar.xz tar -xf Qt5_OpenGLES2.tar.xz -C / " + +INCLUDE version diff --git a/updater/base_buster_armhf.Pifile b/updater/base_buster_armhf.Pifile index 26c8202..b1092f8 100644 --- a/updater/base_buster_armhf.Pifile +++ b/updater/base_buster_armhf.Pifile @@ -62,3 +62,5 @@ wget https://github.com/opencardev/prebuilts/raw/master/qt5/Qt_5151_OpenGLES2.ta cat Qt_5151_OpenGLES2.tar.xz* > Qt5_OpenGLES2.tar.xz tar -xf Qt5_OpenGLES2.tar.xz -C / " + +INCLUDE version diff --git a/updater/version.Pifile b/updater/version.Pifile new file mode 100644 index 0000000..b3de2ea --- /dev/null +++ b/updater/version.Pifile @@ -0,0 +1,19 @@ + +HOST bash -c " +cat > crankshaft.date << EOF +${IMG_DATE} +EOF + +cat > crankshaft.build << EOF +${GIT_HASH} +EOF + +cat > crankshaft.branch << EOF +${GIT_BRANCH} +EOF +" + +# update version +INSTALL "crankshaft.date" "/etc/crankshaft.date" +INSTALL "crankshaft.build" "/etc/crankshaft.build" +INSTALL "crankshaft.branch" "/etc/crankshaft.branch" From f47d56a81e9b237e76aeb71b8eac675f662a3101 Mon Sep 17 00:00:00 2001 From: matt Date: Mon, 6 Jan 2025 23:47:18 +0000 Subject: [PATCH 2/5] split up files for easier updating --- updater/base_buster_arm7.Pifile | 43 +---------------------- updater/base_buster_armhf.Pifile | 43 +---------------------- updater/update.Pifile | 59 ++++++++++++++++++++++++++++++++ updater/version.Pifile | 19 ---------- 4 files changed, 61 insertions(+), 103 deletions(-) create mode 100644 updater/update.Pifile delete mode 100644 updater/version.Pifile diff --git a/updater/base_buster_arm7.Pifile b/updater/base_buster_arm7.Pifile index 3c67ff7..8564c0a 100644 --- a/updater/base_buster_arm7.Pifile +++ b/updater/base_buster_arm7.Pifile @@ -11,47 +11,6 @@ apt-get install -y sl apt-get autoremove -y " -# update openauto and aasdk -RUN bash -c " -rm -f /usr/local/bin/autoapp -wget -O /usr/local/bin/autoapp https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp -chmod 777 /usr/local/bin/autoapp -rm -f /usr/local/bin/autoapp.md5 -wget -O /usr/local/bin/autoapp.md5 https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp.md5 -chmod 644 /usr/local/bin/autoapp.md5 -rm -f /usr/local/bin/autoapp_helper -wget -O /usr/local/bin/autoapp_helper https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp_helper -chmod 777 /usr/local/bin/autoapp_helper -rm -f /usr/local/bin/autoapp_helper.md5 -wget -O /usr/local/bin/autoapp_helper.md5 https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp_helper.md5 -chmod 644 /usr/local/bin/autoapp_helper.md5 -rm -f /usr/local/bin/btservice -wget -O /usr/local/bin/btservice https://github.com/opencardev/prebuilts/raw/master/openauto/btservice -chmod 777 /usr/local/bin/btservice -rm -f /usr/local/bin/btservice.md5 -wget -O /usr/local/bin/btservice.md5 https://github.com/opencardev/prebuilts/raw/master/openauto/btservice.md5 -chmod 644 /usr/local/bin/btservice.md5 -rm -f /usr/local/lib/libaasdk.so -wget -O /usr/local/lib/libaasdk.so https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk.so -chmod 666 /usr/local/lib/libaasdk.so -rm -f /usr/local/lib/libaasdk.so.md5 -wget -O /usr/local/lib/libaasdk.so.md5 https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk.so.md5 -chmod 644 /usr/local/lib/libaasdk.so.md5 -rm -f /usr/local/lib/libaasdk_proto.so -wget -O /usr/local/lib/libaasdk_proto.so https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk_proto.so -chmod 666 /usr/local/lib/libaasdk_proto.so -rm -f /usr/local/lib/libaasdk_proto.so.md5 -wget -O /usr/local/lib/libaasdk_proto.so.md5 https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk_proto.so.md5 -chmod 644 /usr/local/lib/libaasdk_proto.so.md5 -rm -f /usr/local/bin/crankshaft -wget -O /usr/local/bin/crankshaft https://github.com/opencardev/prebuilts/raw/master/csmt/crankshaft -chmod 777 /usr/local/bin/crankshaft -rm -f /usr/local/bin/crankshaft.md5 -wget -O /usr/local/bin/crankshaft.md5 https://github.com/opencardev/prebuilts/raw/master/csmt/crankshaft.md5 -chmod 644 /usr/local/bin/crankshaft.md5 -ldconfig -" - RUN bash -c " cd /root rm -rf /usr/local/qt5 @@ -63,4 +22,4 @@ cat Qt_5151_armv7l_OpenGLES2.tar.xz* > Qt5_OpenGLES2.tar.xz tar -xf Qt5_OpenGLES2.tar.xz -C / " -INCLUDE version +INCLUDE updater/update.Pifile diff --git a/updater/base_buster_armhf.Pifile b/updater/base_buster_armhf.Pifile index b1092f8..20d734e 100644 --- a/updater/base_buster_armhf.Pifile +++ b/updater/base_buster_armhf.Pifile @@ -11,47 +11,6 @@ apt-get install -y sl apt-get autoremove -y " -# update openauto and aasdk -RUN bash -c " -rm -f /usr/local/bin/autoapp -wget -O /usr/local/bin/autoapp https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp -chmod 777 /usr/local/bin/autoapp -rm -f /usr/local/bin/autoapp.md5 -wget -O /usr/local/bin/autoapp.md5 https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp.md5 -chmod 644 /usr/local/bin/autoapp.md5 -rm -f /usr/local/bin/autoapp_helper -wget -O /usr/local/bin/autoapp_helper https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp_helper -chmod 777 /usr/local/bin/autoapp_helper -rm -f /usr/local/bin/autoapp_helper.md5 -wget -O /usr/local/bin/autoapp_helper.md5 https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp_helper.md5 -chmod 644 /usr/local/bin/autoapp_helper.md5 -rm -f /usr/local/bin/btservice -wget -O /usr/local/bin/btservice https://github.com/opencardev/prebuilts/raw/master/openauto/btservice -chmod 777 /usr/local/bin/btservice -rm -f /usr/local/bin/btservice.md5 -wget -O /usr/local/bin/btservice.md5 https://github.com/opencardev/prebuilts/raw/master/openauto/btservice.md5 -chmod 644 /usr/local/bin/btservice.md5 -rm -f /usr/local/lib/libaasdk.so -wget -O /usr/local/lib/libaasdk.so https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk.so -chmod 666 /usr/local/lib/libaasdk.so -rm -f /usr/local/lib/libaasdk.so.md5 -wget -O /usr/local/lib/libaasdk.so.md5 https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk.so.md5 -chmod 644 /usr/local/lib/libaasdk.so.md5 -rm -f /usr/local/lib/libaasdk_proto.so -wget -O /usr/local/lib/libaasdk_proto.so https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk_proto.so -chmod 666 /usr/local/lib/libaasdk_proto.so -rm -f /usr/local/lib/libaasdk_proto.so.md5 -wget -O /usr/local/lib/libaasdk_proto.so.md5 https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk_proto.so.md5 -chmod 644 /usr/local/lib/libaasdk_proto.so.md5 -rm -f /usr/local/bin/crankshaft -wget -O /usr/local/bin/crankshaft https://github.com/opencardev/prebuilts/raw/master/csmt/crankshaft -chmod 777 /usr/local/bin/crankshaft -rm -f /usr/local/bin/crankshaft.md5 -wget -O /usr/local/bin/crankshaft.md5 https://github.com/opencardev/prebuilts/raw/master/csmt/crankshaft.md5 -chmod 644 /usr/local/bin/crankshaft.md5 -ldconfig -" - RUN bash -c " cd /root rm -rf /usr/local/qt5 @@ -63,4 +22,4 @@ cat Qt_5151_OpenGLES2.tar.xz* > Qt5_OpenGLES2.tar.xz tar -xf Qt5_OpenGLES2.tar.xz -C / " -INCLUDE version +INCLUDE updater/update.Pifile diff --git a/updater/update.Pifile b/updater/update.Pifile new file mode 100644 index 0000000..cdbb976 --- /dev/null +++ b/updater/update.Pifile @@ -0,0 +1,59 @@ +# update openauto and aasdk +RUN bash -c " +rm -f /usr/local/bin/autoapp +wget -O /usr/local/bin/autoapp https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp +chmod 777 /usr/local/bin/autoapp +rm -f /usr/local/bin/autoapp.md5 +wget -O /usr/local/bin/autoapp.md5 https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp.md5 +chmod 644 /usr/local/bin/autoapp.md5 +rm -f /usr/local/bin/autoapp_helper +wget -O /usr/local/bin/autoapp_helper https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp_helper +chmod 777 /usr/local/bin/autoapp_helper +rm -f /usr/local/bin/autoapp_helper.md5 +wget -O /usr/local/bin/autoapp_helper.md5 https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp_helper.md5 +chmod 644 /usr/local/bin/autoapp_helper.md5 +rm -f /usr/local/bin/btservice +wget -O /usr/local/bin/btservice https://github.com/opencardev/prebuilts/raw/master/openauto/btservice +chmod 777 /usr/local/bin/btservice +rm -f /usr/local/bin/btservice.md5 +wget -O /usr/local/bin/btservice.md5 https://github.com/opencardev/prebuilts/raw/master/openauto/btservice.md5 +chmod 644 /usr/local/bin/btservice.md5 +rm -f /usr/local/lib/libaasdk.so +wget -O /usr/local/lib/libaasdk.so https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk.so +chmod 666 /usr/local/lib/libaasdk.so +rm -f /usr/local/lib/libaasdk.so.md5 +wget -O /usr/local/lib/libaasdk.so.md5 https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk.so.md5 +chmod 644 /usr/local/lib/libaasdk.so.md5 +rm -f /usr/local/lib/libaasdk_proto.so +wget -O /usr/local/lib/libaasdk_proto.so https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk_proto.so +chmod 666 /usr/local/lib/libaasdk_proto.so +rm -f /usr/local/lib/libaasdk_proto.so.md5 +wget -O /usr/local/lib/libaasdk_proto.so.md5 https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk_proto.so.md5 +chmod 644 /usr/local/lib/libaasdk_proto.so.md5 +rm -f /usr/local/bin/crankshaft +wget -O /usr/local/bin/crankshaft https://github.com/opencardev/prebuilts/raw/master/csmt/crankshaft +chmod 777 /usr/local/bin/crankshaft +rm -f /usr/local/bin/crankshaft.md5 +wget -O /usr/local/bin/crankshaft.md5 https://github.com/opencardev/prebuilts/raw/master/csmt/crankshaft.md5 +chmod 644 /usr/local/bin/crankshaft.md5 +ldconfig +" + +HOST bash -c " +cat > crankshaft.date << EOF +${IMG_DATE} +EOF + +cat > crankshaft.build << EOF +${GIT_HASH} +EOF + +cat > crankshaft.branch << EOF +${GIT_BRANCH} +EOF +" + +# update version +INSTALL "crankshaft.date" "/etc/crankshaft.date" +INSTALL "crankshaft.build" "/etc/crankshaft.build" +INSTALL "crankshaft.branch" "/etc/crankshaft.branch" diff --git a/updater/version.Pifile b/updater/version.Pifile deleted file mode 100644 index b3de2ea..0000000 --- a/updater/version.Pifile +++ /dev/null @@ -1,19 +0,0 @@ - -HOST bash -c " -cat > crankshaft.date << EOF -${IMG_DATE} -EOF - -cat > crankshaft.build << EOF -${GIT_HASH} -EOF - -cat > crankshaft.branch << EOF -${GIT_BRANCH} -EOF -" - -# update version -INSTALL "crankshaft.date" "/etc/crankshaft.date" -INSTALL "crankshaft.build" "/etc/crankshaft.build" -INSTALL "crankshaft.branch" "/etc/crankshaft.branch" From 1e85869662c29028fd62743e35f93cab32267a60 Mon Sep 17 00:00:00 2001 From: matt Date: Mon, 6 Jan 2025 23:52:39 +0000 Subject: [PATCH 3/5] added git lookups --- updater/update.Pifile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updater/update.Pifile b/updater/update.Pifile index cdbb976..3649c93 100644 --- a/updater/update.Pifile +++ b/updater/update.Pifile @@ -41,15 +41,15 @@ ldconfig HOST bash -c " cat > crankshaft.date << EOF -${IMG_DATE} +$(date '+%Y-%m-%d') EOF cat > crankshaft.build << EOF -${GIT_HASH} +$(git rev-parse --short "$GITHUB_SHA") EOF cat > crankshaft.branch << EOF -${GIT_BRANCH} +$(git rev-parse --abbrev-ref HEAD) EOF " From 91f7abcb5b3dd66d8ec6c42f3971548491ea920a Mon Sep 17 00:00:00 2001 From: matt Date: Mon, 6 Jan 2025 23:56:38 +0000 Subject: [PATCH 4/5] fix git sha lookup --- updater/update.Pifile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/updater/update.Pifile b/updater/update.Pifile index 3649c93..2da0afe 100644 --- a/updater/update.Pifile +++ b/updater/update.Pifile @@ -45,7 +45,7 @@ $(date '+%Y-%m-%d') EOF cat > crankshaft.build << EOF -$(git rev-parse --short "$GITHUB_SHA") +$(git rev-parse --short) EOF cat > crankshaft.branch << EOF From 95aa45a081203609b9bdde9d9b536880cdd7c01e Mon Sep 17 00:00:00 2001 From: matt Date: Tue, 7 Jan 2025 00:03:09 +0000 Subject: [PATCH 5/5] add fix for typo --- .github/workflows/pifile.yml | 2 +- updater/update.Pifile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pifile.yml b/.github/workflows/pifile.yml index 990f344..56c969c 100644 --- a/.github/workflows/pifile.yml +++ b/.github/workflows/pifile.yml @@ -134,7 +134,7 @@ jobs: file: ${{ steps.packagezip.outputs.ZIP_FILENAME }} asset_name: ${{ steps.packagezip.outputs.ZIP_FILENAME }} tag: ${{needs.version.outputs.version }} - latest: false + make_latest: false prerelease: true #draft: true #body: ${{steps.github_release.outputs.changelog}} diff --git a/updater/update.Pifile b/updater/update.Pifile index 2da0afe..3570210 100644 --- a/updater/update.Pifile +++ b/updater/update.Pifile @@ -45,7 +45,7 @@ $(date '+%Y-%m-%d') EOF cat > crankshaft.build << EOF -$(git rev-parse --short) +$(git rev-parse --short HEAD) EOF cat > crankshaft.branch << EOF