Skip to content

Commit b7815fc

Browse files
shasarorshasaror
authored
Merge pull request #4 from qualcomm/QUD-1789
Modified scripts and reorganized the folder structure
2 parents c1cbdb2 + 42bff52 commit b7815fc

40 files changed

Lines changed: 1415 additions & 1271 deletions

‎.github/workflows/qcom-preflight-checks.yml‎

Lines changed: 18 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,24 @@
1-
name: Qualcomm Preflight Checks
2-
on:
3-
pull_request_target:
4-
branches:
5-
- main
6-
- develop
7-
- feature/*
8-
- docs/*
1+
name: QC Preflight Checks
92

3+
on:
4+
pull_request:
105
push:
11-
branches:
12-
- main
13-
- develop
14-
- feature/*
15-
- docs/*
6+
branches: [main]
167
workflow_dispatch:
178

18-
permissions:
19-
contents: read
20-
security-events: write
21-
229
jobs:
23-
qcom-preflight-checks:
24-
uses: qualcomm/qcom-reusable-workflows/.github/workflows/qcom-preflight-checks-reusable-workflow.yml@v1.1.4
10+
preflight:
11+
name: Run QC Preflight Checks
12+
uses: qualcomm/qcom-reusable-workflows/.github/workflows/reusable-qcom-preflight-checks-orchestrator.yml@v2
2513
with:
26-
# ✅ Preflight Checkers
27-
repolinter: true # default: true
28-
semgrep: true # default: true
29-
copyright-license-detector: true # default: true
30-
pr-check-emails: true # default: true
31-
dependency-review: true # default: true
32-
secrets:
33-
SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
14+
enable-semgrep-scan: true
15+
enable-dependency-review: true
16+
enable-repolinter-check: true
17+
enable-copyright-license-check: true
18+
enable-commit-email-check: true
19+
enable-commit-msg-check: false
20+
enable-armor-checkers: false
21+
22+
permissions:
23+
contents: read
24+
security-events: write

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,13 @@ pnputil /add-driver <build_path/driver_name.inf> /install
9191

9292
- Installation
9393
```bash
94-
sudo ./QcDevDriver.sh install
94+
sudo ./qcom_drivers.sh install
9595
```
9696
- Uninstallation
9797
```bash
98-
sudo ./QcDevDriver.sh uninstall
98+
sudo ./qcom_drivers.sh uninstall
9999
```
100-
For FAQ's and troubleshooting, please refer to [README](./src/linux/README.md) document.
100+
For more guidance on build process, FAQ's and troubleshooting, please refer to [README](./src/linux/README.md) document.
101101

102102
## Contributing
103103

‎src/linux/InfParser/Makefile‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
11
obj-m := qtiDevInf.o
22
KDIR := /lib/modules/$(shell uname -r)/build
33
PWD := $(shell pwd)
4+
QCOM_USBINF_PARSER_OUTPUTDIR=/lib/modules/$(shell uname -r)/kernel/drivers/usb/misc
45

5-
all: clean
6-
$(MAKE) -C $(KDIR) M=$(PWD) modules
6+
build: clean
7+
make -C $(KDIR) M=$(PWD) modules
78

8-
clean:
9-
rm -rf *.o *~ core .depend .*.cmd *.ko *.mod.c *.mod .tmp_versions Module.* modules.order *.ur-safe
9+
install: build
10+
mkdir -p $(QCOM_USBINF_PARSER_OUTPUTDIR)
11+
cp -f qtiDevInf.ko $(QCOM_USBINF_PARSER_OUTPUTDIR)
12+
depmod
13+
modprobe qtiDevInf
14+
15+
uninstall: clean
16+
rmmod qtiDevInf
17+
rm -rf $(QCOM_USBINF_PARSER_OUTPUTDIR)/qtiDevInf.ko
18+
depmod
1019

20+
clean:
21+
make -C $(KDIR) M=$(PWD) clean
1122

1223

‎src/linux/Makefile‎

Lines changed: 42 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,51 @@
1-
obj-y := InfParser/ qdssdiag/ rmnet/ #GobiSerial/
1+
obj-y := InfParser/ qcom_usb/ qcom_usbnet/ qcom_serial/
22
PWD := $(shell pwd)
3-
OUTPUTDIR=/lib/modules/$(shell uname -r)/kernel/drivers/net/usb/
3+
KDIR := /lib/modules/$(shell uname -r)/build
4+
KHEADERS := /usr/src/linux-headers-$(shell uname -r)
5+
QCOM_USB_OUTPUTDIR=/lib/modules/$(shell uname -r)/kernel/drivers/usb/misc
6+
QCOM_NET_OUTPUTDIR=/lib/modules/$(shell uname -r)/kernel/drivers/net/usb
47
OUTPUTDIR_MDM=/lib/modules/$(shell uname -r)/kernel/drivers/usb/serial/
58
SECUREBOOT := $(shell mokutil --sb-state)
9+
DEST_SIGN_PATH=/opt/qcom/QUD/sign
610

7-
all: clean
8-
$(MAKE) -C /lib/modules/$(shell uname -r)/build M=$(PWD) modules
9-
10-
install: all
11-
# mkdir -p $(OUTPUTDIR)
11+
build: clean
12+
$(MAKE) -C $(KDIR) M=$(PWD) modules
1213
ifeq ($(SECUREBOOT),SecureBoot enabled)
13-
/usr/src/linux-headers-$(shell uname -r)/scripts/sign-file sha256 /opt/QTI/sign/Signkey.priv /opt/QTI/sign/Signkey_pub.der ./InfParser/qtiDevInf.ko
14-
# /usr/src/linux-headers-$(shell uname -r)/scripts/sign-file sha256 /opt/QTI/sign/Signkey.priv /opt/QTI/sign/Signkey_pub.der ./GobiSerial/GobiSerial.ko
15-
/usr/src/linux-headers-$(shell uname -r)/scripts/sign-file sha256 /opt/QTI/sign/Signkey.priv /opt/QTI/sign/Signkey_pub.der ./QdssDiag/QdssDiag.ko
16-
/usr/src/linux-headers-$(shell uname -r)/scripts/sign-file sha256 /opt/QTI/sign/Signkey.priv /opt/QTI/sign/Signkey_pub.der ./rmnet/GobiNet.ko
14+
$(KHEADERS)/scripts/sign-file sha256 $(DEST_SIGN_PATH)/Signkey.priv $(DEST_SIGN_PATH)/Signkey_pub.der ./InfParser/qtiDevInf.ko
15+
# $(KHEADERS)/scripts/sign-file sha256 $(DEST_SIGN_PATH)/Signkey.priv $(DEST_SIGN_PATH)/Signkey_pub.der ./qcom_serial/qcom_serial.ko
16+
$(KHEADERS)/scripts/sign-file sha256 $(DEST_SIGN_PATH)/Signkey.priv $(DEST_SIGN_PATH)/Signkey_pub.der ./qcom_usb/qcom_usb.ko
17+
$(KHEADERS)/scripts/sign-file sha256 $(DEST_SIGN_PATH)/Signkey.priv $(DEST_SIGN_PATH)/Signkey_pub.der ./qcom_net/qcom_usbnet.ko
1718
endif
18-
cp -f ./qdssdiag/qdssdiag.ko $(OUTPUTDIR)
19-
cp -f ./rmnet/GobiNet.ko $(OUTPUTDIR)
20-
cp -f ./InfParser/qtiDevInf.ko $(OUTPUTDIR)
21-
# cp -f ./GobiSerial/GobiSerial.ko $(OUTPUTDIR_MDM)
19+
20+
install: build
21+
mkdir -p $(QCOM_USB_OUTPUTDIR)
22+
mkdir -p $(QCOM_NET_OUTPUTDIR)
23+
mkdir -p $(OUTPUTDIR_MDM)
24+
rm -rf $(QCOM_USB_OUTPUTDIR)/qtiDevInf.ko
25+
rm -rf $(QCOM_USB_OUTPUTDIR)/qcom_usb.ko
26+
rm -rf $(QCOM_NET_OUTPUTDIR)/qcom_usbnet.ko
27+
rm -rf $(OUTPUTDIR_MDM)/qcom_serial.ko
28+
cp -rf ./InfParser/qtiDevInf.ko $(QCOM_USB_OUTPUTDIR)
29+
cp -rf ./qcom_usb/qcom_usb.ko $(QCOM_USB_OUTPUTDIR)
30+
cp -rf ./qcom_usbnet/qcom_usbnet.ko $(QCOM_NET_OUTPUTDIR)
31+
cp -rf ./qcom_serial/qcom_serial.ko $(OUTPUTDIR_MDM)
32+
depmod
33+
# modprobe qcom_serial
34+
modprobe qtiDevInf
35+
modprobe qcom_usb
36+
modprobe qcom_usbnet debug_g=1 debug_aggr=0
37+
38+
uninstall: clean
39+
rmmod qtiDevInf
40+
rmmod qcom_usb
41+
rmmod qcom_usbnet
42+
rmmod qcom_serial
43+
rm -rf $(QCOM_USB_OUTPUTDIR)/qtiDevInf.ko
44+
rm -rf $(QCOM_USB_OUTPUTDIR)/qcom_usb.ko
45+
rm -rf $(QCOM_NET_OUTPUTDIR)/qcom_usbnet.ko
46+
rm -rf $(OUTPUTDIR_MDM)/qcom_serial.ko
2247
depmod
2348

2449
clean:
25-
$(MAKE) -C /lib/modules/$(shell uname -r)/build M=$(PWD) clean
26-
$(RM) Module.markers modules.order
50+
$(MAKE) -C $(KDIR) M=$(PWD) clean
51+

0 commit comments

Comments
 (0)