From 64f500fbc3e065447e267aac8f1a1e74aee513c2 Mon Sep 17 00:00:00 2001 From: nyyu Date: Sun, 25 Sep 2022 14:45:49 +0200 Subject: [PATCH] lineage 20 --- .drone.yml | 6 ++--- fix-audio-build.patch | 45 +++++++++++++++++++++++++++++++++++ fix-build-kernel-header.patch | 25 +++++++++++++++++++ fix-qcwcn-build.patch | 23 ++++++++++++++++++ mondrianwifi.xml | 20 +++++++--------- sync.sh | 29 +++++++++++++++++----- 6 files changed, 127 insertions(+), 21 deletions(-) create mode 100644 fix-audio-build.patch create mode 100644 fix-build-kernel-header.patch create mode 100644 fix-qcwcn-build.patch diff --git a/.drone.yml b/.drone.yml index 3a1b8a8..1d4ef68 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,7 +4,7 @@ name: mondrianwifi environment: device: mondrianwifi - version: 19.1 + version: 20.0 steps: - name: sync @@ -62,7 +62,7 @@ volumes: path: /srv/http/drone - name: build host: - path: /media/fast/lineage/lineage-19.1 + path: /media/fast/lineage/lineage-20.0 image_pull_secrets: - dockerconfig @@ -73,7 +73,7 @@ name: mondrianwifi-publish environment: device: mondrianwifi - version: 19.1 + version: 20.0 steps: - name: publish diff --git a/fix-audio-build.patch b/fix-audio-build.patch new file mode 100644 index 0000000..7491cbb --- /dev/null +++ b/fix-audio-build.patch @@ -0,0 +1,45 @@ +From 0cc8f8d2a24526bd5baafb2fd89a991ad0218b7b Mon Sep 17 00:00:00 2001 +From: nyyu +Date: Sun, 25 Sep 2022 14:52:01 +0200 +Subject: [PATCH] audio: fix build + +Change-Id: I6d76b39be5cb0e6fee9d0154f2d84b61e386fe32 +--- + visualizer/offload_visualizer.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/visualizer/offload_visualizer.c b/visualizer/offload_visualizer.c +index 0166ac2..f38bed9 100644 +--- a/visualizer/offload_visualizer.c ++++ b/visualizer/offload_visualizer.c +@@ -38,7 +38,13 @@ enum { + }; + + typedef struct effect_context_s effect_context_t; +-typedef struct output_context_s output_context_t; ++ ++typedef struct output_context_s { ++ struct listnode outputs_list_node; /* node in active_outputs_list */ ++ audio_io_handle_t handle; /* io handle */ ++ struct listnode effects_list; /* list of effects attached to this output */ ++} output_context_t; ++ + + /* effect specific operations. Only the init() and process() operations must be defined. + * Others are optional. +@@ -72,12 +78,6 @@ struct effect_context_s { + effect_ops_t ops; + }; + +-typedef struct output_context_s { +- struct listnode outputs_list_node; /* node in active_outputs_list */ +- audio_io_handle_t handle; /* io handle */ +- struct listnode effects_list; /* list of effects attached to this output */ +-} output_context_t; +- + + /* maximum time since last capture buffer update before resetting capture buffer. This means + that the framework has stopped playing audio and we must start returning silence */ +-- +2.37.3 + diff --git a/fix-build-kernel-header.patch b/fix-build-kernel-header.patch new file mode 100644 index 0000000..9bbef77 --- /dev/null +++ b/fix-build-kernel-header.patch @@ -0,0 +1,25 @@ +From 3c8dd9d84ec1b52ddd449ccaf7a8f94f9d0f2932 Mon Sep 17 00:00:00 2001 +From: nyyu +Date: Sun, 25 Sep 2022 14:54:37 +0200 +Subject: [PATCH] fix: build kernel header + +--- + build/soong/Android.bp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/soong/Android.bp b/build/soong/Android.bp +index 5cbcd19b..02ed36da 100644 +--- a/build/soong/Android.bp ++++ b/build/soong/Android.bp +@@ -21,7 +21,7 @@ lineage_generator { + name: "generated_kernel_includes", + + // The headers make command +- cmd: "$(PATH_OVERRIDE_SOONG) $(KERNEL_MAKE_CMD) $(KERNEL_MAKE_FLAGS) -C $(TARGET_KERNEL_SOURCE) O=$(KERNEL_BUILD_OUT_PREFIX)$(genDir) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) headers_install", ++ cmd: "mkdir -p $(KERNEL_BUILD_OUT_PREFIX)$(genDir) && $(PATH_OVERRIDE_SOONG) $(KERNEL_MAKE_CMD) $(KERNEL_MAKE_FLAGS) -C $(TARGET_KERNEL_SOURCE) O=$(KERNEL_BUILD_OUT_PREFIX)$(genDir) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) headers_install", + + // Directories that can be imported by a cc_* module generated_headers property + export_include_dirs: [ +-- +2.37.3 + diff --git a/fix-qcwcn-build.patch b/fix-qcwcn-build.patch new file mode 100644 index 0000000..a035653 --- /dev/null +++ b/fix-qcwcn-build.patch @@ -0,0 +1,23 @@ +From 796a67b903fb4a1dc47de4aa981af4bc2f88df65 Mon Sep 17 00:00:00 2001 +From: nyyu +Date: Sat, 24 Sep 2022 12:41:39 +0200 +Subject: [PATCH] qcwcn: fix build error format msg + +Change-Id: Ie99ff98324d2aefde585c7d3d8b603c6e725e78f +--- + qcwcn/wpa_supplicant_8_lib/driver_cmd_nl80211.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qcwcn/wpa_supplicant_8_lib/driver_cmd_nl80211.c b/qcwcn/wpa_supplicant_8_lib/driver_cmd_nl80211.c +index 9656710..e89a741 100644 +--- a/qcwcn/wpa_supplicant_8_lib/driver_cmd_nl80211.c ++++ b/qcwcn/wpa_supplicant_8_lib/driver_cmd_nl80211.c +@@ -2739,7 +2739,7 @@ void print_setup_cmd_values(struct twt_setup_parameters *twt_setup_params) + twt_setup_params->min_wake_duration); + wpa_printf(MSG_DEBUG, "TWT: max wake duration: %d ", + twt_setup_params->max_wake_duration); +- wpa_printf(MSG_DEBUG, "TWT: wake tsf: 0x%lx ", ++ wpa_printf(MSG_DEBUG, "TWT: wake tsf: 0x%llx ", + twt_setup_params->wake_tsf); + wpa_printf(MSG_DEBUG, "TWT: announce timeout(in us): %u", + twt_setup_params->announce_timeout_us); diff --git a/mondrianwifi.xml b/mondrianwifi.xml index 6a1a097..31c22db 100644 --- a/mondrianwifi.xml +++ b/mondrianwifi.xml @@ -1,21 +1,17 @@ - - - - - - - + + + + + + + - - - - - + \ No newline at end of file diff --git a/sync.sh b/sync.sh index 3f583b7..02e2e45 100644 --- a/sync.sh +++ b/sync.sh @@ -23,13 +23,30 @@ cd $TOPDIR cd packages/apps/Camera2 git am $DRONE_WORKSPACE_BASE/fix-camera2-legacy.patch || git am --abort cd $TOPDIR -repopick -t twelve-colors -i -r -cd frameworks/base -git reset --hard losul/lineage-19.1 + +#qcom wlan +repopick 336676 336677 336678 336679 336680 +cd hardware/qcom-caf/wlan +git am $DRONE_WORKSPACE_BASE/fix-qcwcn-build.patch || git am --abort cd $TOPDIR -repopick -P frameworks/base -r 336824 336825 336826 336827 336828 336829 336830 336831 336832 336833 336834 336835 336836 -repopick -f 333534 -P system/core -repopick -f 329229 329230 -P frameworks/base + +#qcom caf audio +cd hardware/qcom-caf/msm8974/audio +git am $DRONE_WORKSPACE_BASE/fix-audio-build.patch || git am --abort +cd $TOPDIR + +#lineage +#cd vendor/lineage +#git am $DRONE_WORKSPACE_BASE/fix-build-kernel-header.patch || git am --abort +#cd $TOPDIR + +#safetynet +repopick -f 334348 -P system/core +repopick -f 334343 334344 -P frameworks/base + +#misc +repopick 336186 +repopick 338888 echo -e "# Build $(date '+%Y-%m-%d %H:%M:%S') UTC\n" >>"${changelog}"