archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2024-09-19 22:08:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

core/linux-odroid-xu3 to 4.14.180-2

Browse source 
closes #1870
This commit is contained in:
moonman 2021-05-13 00:17:55 -06:00
parent 3a2fbcd671
commit 2b1276c853
4 changed files with 331 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

320
core/linux-odroid-xu3/0001-rtl8812au-sprintf-fix-gcc10.patch Normal file
View file

@ -0,0 +1,320 @@
diff -ruN a/drivers/net/wireless/rtl8812au/core/rtw_mp.c b/drivers/net/wireless/rtl8812au/core/rtw_mp.c
--- a/drivers/net/wireless/rtl8812au/core/rtw_mp.c 2020-08-20 02:08:41.000000000 -0600
+++ b/drivers/net/wireless/rtl8812au/core/rtw_mp.c 2021-05-12 20:51:59.858880819 -0600
@@ -1871,7 +1871,7 @@
} else {
psd_data = rtw_GetPSDData(pAdapter, i);
}
- sprintf(data, "%s%x ", data, psd_data);
+ sprintf(data + strlen(data), "%x ", psd_data);
i++;
}
diff -ruN a/drivers/net/wireless/rtl8812au/os_dep/linux/ioctl_linux.c b/drivers/net/wireless/rtl8812au/os_dep/linux/ioctl_linux.c
--- a/drivers/net/wireless/rtl8812au/os_dep/linux/ioctl_linux.c 2020-08-20 02:08:41.000000000 -0600
+++ b/drivers/net/wireless/rtl8812au/os_dep/linux/ioctl_linux.c 2021-05-12 20:53:45.926325818 -0600
@@ -9068,19 +9068,19 @@
sprintf(extra, "\n");
for (i = 0; i < EFUSE_MAP_SIZE; i += 16) {
// DBG_871X("0x%02x\t", i);
- sprintf(extra, "%s0x%02x\t", extra, i);
+ sprintf(extra + strlen(extra), "0x%02x\t", i);
for (j=0; j<8; j++) {
// DBG_871X("%02X ", data[i+j]);
- sprintf(extra, "%s%02X ", extra, PROMContent[i+j]);
+ sprintf(extra + strlen(extra), "%02X ", PROMContent[i+j]);
}
// DBG_871X("\t");
- sprintf(extra, "%s\t", extra);
+ sprintf(extra + strlen(extra), "\t");
for (; j<16; j++) {
// DBG_871X("%02X ", data[i+j]);
- sprintf(extra, "%s%02X ", extra, PROMContent[i+j]);
+ sprintf(extra + strlen(extra), "%02X ", PROMContent[i+j]);
}
// DBG_871X("\n");
- sprintf(extra,"%s\n",extra);
+ sprintf(extra + strlen(extra), "\n");
}
// DBG_871X("\n");
} else if (strcmp(tmp[0], "realmap") == 0) {
@@ -9095,19 +9095,19 @@
sprintf(extra, "\n");
for (i = 0; i < EFUSE_MAP_SIZE; i += 16) {
// DBG_871X("0x%02x\t", i);
- sprintf(extra, "%s0x%02x\t", extra, i);
+ sprintf(extra + strlen(extra), "0x%02x\t", i);
for (j=0; j<8; j++) {
// DBG_871X("%02X ", data[i+j]);
- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeEfuseInitMap[i+j]);
+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeEfuseInitMap[i+j]);
}
// DBG_871X("\t");
- sprintf(extra, "%s\t", extra);
+ sprintf(extra + strlen(extra), "\t");
for (; j<16; j++) {
// DBG_871X("%02X ", data[i+j]);
- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeEfuseInitMap[i+j]);
+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeEfuseInitMap[i+j]);
}
// DBG_871X("\n");
- sprintf(extra,"%s\n",extra);
+ sprintf(extra + strlen(extra), "\n");
}
// DBG_871X("\n");
} else if (strcmp(tmp[0], "rmap") == 0) {
@@ -9146,7 +9146,7 @@
*extra = 0;
for (i=0; i<cnts; i++) {
// DBG_871X("0x%02x ", data[i]);
- sprintf(extra, "%s0x%02X ", extra, data[i]);
+ sprintf(extra + strlen(extra), "0x%02X ", data[i]);
}
// DBG_871X("}\n");
} else if (strcmp(tmp[0], "realraw") == 0) {
@@ -9162,17 +9162,17 @@
sprintf(extra, "\n0x00\t");
for (i=0; i< mapLen; i++) {
// DBG_871X("%02X", rawdata[i]);
- sprintf(extra, "%s%02X", extra, rawdata[i]);
+ sprintf(extra + strlen(extra), "%02X", rawdata[i]);
if ((i & 0xF) == 0xF) {
// DBG_871X("\n");
- sprintf(extra, "%s\n", extra);
- sprintf(extra, "%s0x%02x\t", extra, i+1);
+ sprintf(extra + strlen(extra), "\n");
+ sprintf(extra + strlen(extra), "0x%02x\t", i+1);
} else if ((i & 0x7) == 0x7) {
// DBG_871X("\t");
- sprintf(extra, "%s \t", extra);
+ sprintf(extra + strlen(extra), " \t");
} else {
// DBG_871X(" ");
- sprintf(extra, "%s ", extra);
+ sprintf(extra + strlen(extra), " ");
}
}
// DBG_871X("}\n");
@@ -9257,10 +9257,10 @@
*extra = 0;
for (i=0; i<cnts; i++) {
// DBG_871X("%02X", data[i]);
- sprintf(extra, "%s%02X", extra, data[i]);
+ sprintf(extra + strlen(extra), "%02X", data[i]);
if (i != (cnts-1)) {
// DBG_871X(":");
- sprintf(extra,"%s:",extra);
+ sprintf(extra + strlen(extra), ":");
}
}
// DBG_871X("}\n");
@@ -9318,10 +9318,10 @@
*extra = 0;
for (i=0; i<cnts; i++) {
// DBG_871X("0x%02x", data[i]);
- sprintf(extra, "%s0x%02X", extra, data[i]);
+ sprintf(extra + strlen(extra), "0x%02X", data[i]);
if (i != (cnts-1)) {
// DBG_871X(",");
- sprintf(extra,"%s,",extra);
+ sprintf(extra + strlen(extra), ",");
}
}
// DBG_871X("}\n");
@@ -9343,19 +9343,19 @@
sprintf(extra, "\n");
for (i=0; i<512; i+=16) { // set 512 because the iwpriv's extra size have limit 0x7FF
// DBG_871X("0x%03x\t", i);
- sprintf(extra, "%s0x%03x\t", extra, i);
+ sprintf(extra + strlen(extra), "0x%03x\t", i);
for (j=0; j<8; j++) {
// DBG_871X("%02X ", pEfuseHal->BTEfuseInitMap[i+j]);
- sprintf(extra, "%s%02X ", extra, pEfuseHal->BTEfuseInitMap[i+j]);
+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->BTEfuseInitMap[i+j]);
}
// DBG_871X("\t");
- sprintf(extra,"%s\t",extra);
+ sprintf(extra + strlen(extra), "\t");
for (; j<16; j++) {
// DBG_871X("%02X ", pEfuseHal->BTEfuseInitMap[i+j]);
- sprintf(extra, "%s%02X ", extra, pEfuseHal->BTEfuseInitMap[i+j]);
+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->BTEfuseInitMap[i+j]);
}
// DBG_871X("\n");
- sprintf(extra, "%s\n", extra);
+ sprintf(extra + strlen(extra), "\n");
}
// DBG_871X("\n");
} else if (strcmp(tmp[0],"btbmap") == 0) {
@@ -9372,19 +9372,19 @@
sprintf(extra, "\n");
for (i=512; i<1024 ; i+=16) {
// DBG_871X("0x%03x\t", i);
- sprintf(extra, "%s0x%03x\t", extra, i);
+ sprintf(extra + strlen(extra), "0x%03x\t", i);
for (j=0; j<8; j++) {
// DBG_871X("%02X ", data[i+j]);
- sprintf(extra, "%s%02X ", extra, pEfuseHal->BTEfuseInitMap[i+j]);
+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->BTEfuseInitMap[i+j]);
}
// DBG_871X("\t");
- sprintf(extra,"%s\t",extra);
+ sprintf(extra + strlen(extra), "\t");
for (; j<16; j++) {
// DBG_871X("%02X ", data[i+j]);
- sprintf(extra, "%s%02X ", extra, pEfuseHal->BTEfuseInitMap[i+j]);
+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->BTEfuseInitMap[i+j]);
}
// DBG_871X("\n");
- sprintf(extra, "%s\n", extra);
+ sprintf(extra + strlen(extra), "\n");
}
// DBG_871X("\n");
} else if (strcmp(tmp[0],"btrmap") == 0) {
@@ -9424,7 +9424,7 @@
// DBG_871X("%s: bt efuse data={", __FUNCTION__);
for (i=0; i<cnts; i++) {
// DBG_871X("0x%02x ", data[i]);
- sprintf(extra, "%s 0x%02X ", extra, data[i]);
+ sprintf(extra + strlen(extra), " 0x%02X ", data[i]);
}
// DBG_871X("}\n");
DBG_871X(FUNC_ADPT_FMT ": BT MAC=[%s]\n", FUNC_ADPT_ARG(padapter), extra);
@@ -9433,19 +9433,19 @@
sprintf(extra, "\n");
for (i=0; i<512; i+=16) {
// DBG_871X("0x%03x\t", i);
- sprintf(extra, "%s0x%03x\t", extra, i);
+ sprintf(extra + strlen(extra), "0x%03x\t", i);
for (j=0; j<8; j++) {
// DBG_871X("%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]);
- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeBTEfuseModifiedMap[i+j]);
+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]);
}
// DBG_871X("\t");
- sprintf(extra, "%s\t", extra);
+ sprintf(extra + strlen(extra), "\t");
for (; j<16; j++) {
// DBG_871X("%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]);
- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeBTEfuseModifiedMap[i+j]);
+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]);
}
// DBG_871X("\n");
- sprintf(extra, "%s\n", extra);
+ sprintf(extra + strlen(extra), "\n");
}
// DBG_871X("\n");
} else if (strcmp(tmp[0],"btbfake") == 0) {
@@ -9453,19 +9453,19 @@
sprintf(extra, "\n");
for (i=512; i<1024; i+=16) {
// DBG_871X("0x%03x\t", i);
- sprintf(extra, "%s0x%03x\t", extra, i);
+ sprintf(extra + strlen(extra), "0x%03x\t", i);
for (j=0; j<8; j++) {
// DBG_871X("%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]);
- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeBTEfuseModifiedMap[i+j]);
+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]);
}
// DBG_871X("\t");
- sprintf(extra, "%s\t", extra);
+ sprintf(extra + strlen(extra), "\t");
for (; j<16; j++) {
// DBG_871X("%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]);
- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeBTEfuseModifiedMap[i+j]);
+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]);
}
// DBG_871X("\n");
- sprintf(extra, "%s\n", extra);
+ sprintf(extra + strlen(extra), "\n");
}
// DBG_871X("\n");
} else if (strcmp(tmp[0],"wlrfkmap")== 0) {
@@ -9473,19 +9473,19 @@
sprintf(extra, "\n");
for (i=0; i<EFUSE_MAP_SIZE; i+=16) {
// DBG_871X("\t0x%02x\t", i);
- sprintf(extra, "%s0x%02x\t", extra, i);
+ sprintf(extra + strlen(extra), "0x%02x\t", i);
for (j=0; j<8; j++) {
// DBG_871X("%02X ", pEfuseHal->fakeEfuseModifiedMap[i+j]);
- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeEfuseModifiedMap[i+j]);
+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeEfuseModifiedMap[i+j]);
}
// DBG_871X("\t");
- sprintf(extra, "%s\t", extra);
+ sprintf(extra + strlen(extra), "\t");
for (; j<16; j++) {
// DBG_871X("%02X ", pEfuseHal->fakeEfuseModifiedMap[i+j]);
- sprintf(extra, "%s %02X", extra, pEfuseHal->fakeEfuseModifiedMap[i+j]);
+ sprintf(extra + strlen(extra), " %02X", pEfuseHal->fakeEfuseModifiedMap[i+j]);
}
// DBG_871X("\n");
- sprintf(extra, "%s\n", extra);
+ sprintf(extra + strlen(extra), "\n");
}
// DBG_871X("\n");
@@ -9511,7 +9511,7 @@
*extra = 0;
for (i=0; i<cnts; i++) {
DBG_871X("wlrfkrmap = 0x%02x \n", pEfuseHal->fakeEfuseModifiedMap[addr+i]);
- sprintf(extra, "%s0x%02X ", extra, pEfuseHal->fakeEfuseModifiedMap[addr+i]);
+ sprintf(extra + strlen(extra), "0x%02X ", pEfuseHal->fakeEfuseModifiedMap[addr+i]);
}
} else if (strcmp(tmp[0],"btrfkrmap")== 0) {
if ((tmp[1]==NULL) || (tmp[2]==NULL)) {
@@ -9535,7 +9535,7 @@
*extra = 0;
for (i=0; i<cnts; i++) {
DBG_871X("wlrfkrmap = 0x%02x \n", pEfuseHal->fakeBTEfuseModifiedMap[addr+i]);
- sprintf(extra, "%s0x%02X ", extra, pEfuseHal->fakeBTEfuseModifiedMap[addr+i]);
+ sprintf(extra + strlen(extra), "0x%02X ", pEfuseHal->fakeBTEfuseModifiedMap[addr+i]);
}
} else {
sprintf(extra, "Command not found!");
@@ -10378,7 +10378,7 @@
pnext++;
if ( *pnext != '\0' ) {
strtout = simple_strtoul (pnext , &ptmp, 16);
- sprintf( extra, "%s %d" ,extra ,strtout );
+ sprintf(extra + strlen(extra), " %d" ,strtout );
} else {
break;
}
@@ -10412,7 +10412,7 @@
pnext++;
if ( *pnext != '\0' ) {
strtout = simple_strtoul (pnext , &ptmp, 16);
- sprintf( extra, "%s %d" ,extra ,strtout );
+ sprintf(extra + strlen(extra), " %d" ,strtout );
} else {
break;
}
@@ -10525,7 +10525,7 @@
pnext++;
if ( *pnext != '\0' ) {
strtou = simple_strtoul (pnext , &ptmp, 16);
- sprintf( extra, "%s %d" ,extra ,strtou );
+ sprintf(extra + strlen(extra), " %d" ,strtou );
} else {
break;
}
@@ -11985,14 +11985,14 @@
goto exit;
#ifdef CONFIG_RTL8723A
- sprintf(extra, "%s %d ", extra, (pMptCtx->mptOutBuf[i]& 0x3f));
+ sprintf(extra + strlen(extra), " %d ", (pMptCtx->mptOutBuf[i]& 0x3f));
#else
- sprintf(extra, "%s %d ", extra, (pMptCtx->mptOutBuf[i]& 0x1f));
+ sprintf(extra + strlen(extra), " %d ", (pMptCtx->mptOutBuf[i]& 0x1f));
#endif
}
} else {
for (i=4; i<pMptCtx->mptOutLen; i++) {
- sprintf(extra, "%s 0x%x ", extra, pMptCtx->mptOutBuf[i]);
+ sprintf(extra + strlen(extra), " 0x%x ", pMptCtx->mptOutBuf[i]);
}
}

12
core/linux-odroid-xu3/PKGBUILD
View file

@ -4,23 +4,25 @@
buildarch=4
pkgbase=linux-odroid-xu3
_commit=7a87c7a444ab5e0a93314d1d311e5cc1ca358274
_commit=864c4519b77763274b61a035b33bc92f71084b59
_srcname=linux-${_commit}
_kernelname=${pkgbase#linux}
_desc="ODROID-XU3/XU4/HC1"
pkgver=4.14.180
pkgrel=1
pkgrel=2
arch=('armv7h')
url="https://github.com/hardkernel/linux"
license=('GPL2')
makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git')
options=('!strip')
source=("https://github.com/hardkernel/linux/archive/${_commit}.tar.gz"
'0001-rtl8812au-sprintf-fix-gcc10.patch'
'config'
'linux.preset'
'99-linux.hook')
md5sums=('916ab700e0e1eb773745715f99258d6f'
'170cdff5ddd12492e205c61261e9ff74'
md5sums=('249d4767373ab56ae16a0a23a69c61a2'
'20bf3136f2725be5b6a2eb7a5a8682bf'
'52c34a510c9d93755d6fb1f93ea5b574'
'a84976d500db50cee07177eccfe2f455'
'79fa396e3f9a09a85156d6d7c2d34b58')
@ -29,6 +31,8 @@ prepare() {
cat "${srcdir}/config" > ./.config
patch -Np1 -i ../0001-rtl8812au-sprintf-fix-gcc10.patch
# add pkgrel to extraversion
sed -ri "s|^(EXTRAVERSION =)(.*)|\1 \2-${pkgrel}|" Makefile

4
core/linux-odroid-xu3/config
View file

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.14.157-1 Kernel Configuration
# Linux/arm 4.14.180-1 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@ -138,7 +138,7 @@ CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
CONFIG_CFS_BANDWIDTH=y
CONFIG_RT_GROUP_SCHED=y
# CONFIG_CGROUP_PIDS is not set
CONFIG_CGROUP_PIDS=y
CONFIG_CGROUP_RDMA=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CPUSETS=y

2
core/linux-odroid-xu3/linux-odroid-xu3.install
View file

@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-odroid-xu3
KERNEL_VERSION=4.14.13-1-ARCH
KERNEL_VERSION=4.14.180-2-ARCH
post_install () {
# updating module dependencies