Skip to content

Commit 7e4f804

Browse files
committed
chore: adapt patches to the latest AIC release
1 parent 78d6075 commit 7e4f804

20 files changed

Lines changed: 73 additions & 200 deletions

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
]
1414
}
1515
},
16-
"image": "mcr.microsoft.com/devcontainers/base:bookworm",
16+
"image": "mcr.microsoft.com/devcontainers/base:bullseye",
1717
"features": {
1818
"ghcr.io/devcontainers/features/nix:1": {
1919
"version": "latest",

.github/local/Makefile.local

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
SRC-AICRF-TEST := src/tools/aicrf_test/
2+
BIN-AICRF-TEST := bt_test wifi_test
3+
BINS-AICRF-TEST := $(addprefix $(SRC-AICRF-TEST),$(BIN-AICRF-TEST))
4+
5+
post_build:
6+
rm -f src/PCIE/driver_fw/driver/deb/aic8800pcie/AIC8800/aicrf_test/wifi_test
7+
8+
.PHONY: build-aicrf-test
9+
build-aicrf-test: $(BINS-AICRF-TEST)
10+
$(MAKE) CROSS_COMPILE=aarch64-linux-gnu- -C $(SRC-AICRF-TEST)
11+
12+
.PHONY: clean-aicrf-test
13+
clean-aicrf-test:
14+
$(MAKE) -C $(SRC-AICRF-TEST) -j$(shell nproc) clean || true
15+
16+
main_build: build-aicrf-test
17+
clean: clean-aicrf-test

.github/local/rules.local

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
export DEB_CFLAGS_MAINT_APPEND = -pthread
2+
3+
override_dh_install:
4+
DEB_VERSION=$(DEB_VERSION) dh_install \
5+
--exclude=*.ko \
6+
--exclude=*.a \
7+
--exclude=*.swp \
8+
--exclude=*.o \
9+
--exclude=.gitignore
10+
11+
override_dh_shlibdeps:
12+
dh_shlibdeps -l/lib/aarch64-linux-gnu/
13+
14+
override_dh_dkms:
15+
dh_dkms -V $(DEB_VERSION)

.gitignore

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
1+
# Devenv
2+
/.devenv*
3+
/devenv.local.nix
4+
5+
# direnv
6+
/.direnv
7+
8+
# pre-commit
9+
/.pre-commit-config.yaml
10+
11+
# Local VS Code configuration
112
/.vscode*
2-
/SOURCE
3-
/VERSION
4-
/.pc
13+
14+
# Kernel build artifacts
15+
/*.deb
16+
/*.buildinfo
17+
/*.changes
18+
/.pc
19+
20+
# Output folder
21+
/out

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ dch: debian/changelog
6161

6262
.PHONY: deb
6363
deb: debian
64-
$(CUSTOM_DEBUILD_ENV) debuild --no-lintian --lintian-hook "lintian --fail-on error,warning --suppress-tags-from-file $(PWD)/debian/common-lintian-overrides -- %p_%v_*.changes" --no-sign -b
64+
$(CUSTOM_DEBUILD_ENV) debuild --no-lintian --lintian-hook "lintian --fail-on error,warning --suppress-tags-from-file $(PWD)/debian/common-lintian-overrides -- %p_%v_*.changes" --no-sign -b -aarm64 -Pcross
6565

6666
.PHONY: release
6767
release:

debian/aic8800-firmware.docs

Lines changed: 0 additions & 1 deletion
This file was deleted.

debian/aic8800-firmware.install

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
src/PCIE/driver_fw/fw/* /lib/firmware/aic8800_fw/PCIE/
22
src/SDIO/driver_fw/fw/* /lib/firmware/aic8800_fw/SDIO/
33
src/USB/driver_fw/fw/* /lib/firmware/aic8800_fw/USB/
4-
debian/patches/fmacfw_8800d80_u02.bin /lib/firmware/aic8800_fw/USB/aic8800D80/

debian/aic8800-pcie-dkms.docs

Lines changed: 0 additions & 1 deletion
This file was deleted.

debian/aic8800-sdio-dkms.docs

Lines changed: 0 additions & 1 deletion
This file was deleted.

debian/aic8800-usb-dkms.docs

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)