search

tbsdtv / linux_media

TBS linux open source drivers
https://github.com/tbsdtv/linux_media/wiki
Other
174 stars 80 forks source link

Build fails with latest Debian 12 kernel 6.1.0-14-amd64 #335

Closed ritzmann closed 9 months ago

ritzmann commented 9 months ago 
$ git clean -dfx
$ git pull
Already up to date.
$ ./build
Checking if the needed tools for Debian GNU/Linux 12 (bookworm) are available
Needed package dependencies are met.

************************************************************
* This script will download the latest tarball and build it*
* Assuming that your kernel is compatible with the latest  *
* drivers. If not, you'll need to add some extra backports,*
* ./backports/<kernel> directory.                          *
* It will also update this tree to be sure that all compat *
* bits are there, to avoid compilation failures            *
************************************************************
************************************************************
* All drivers and build system are under GPLv2 License     *
* Firmware files are under the license terms found at:     *
* https://github.com/tbsdtv/media_build/releases/download/latest *
* Please abort in the next 5 secs if you don't agree with  *
* the license                                              *
************************************************************

Not aborted. It means that the licence was agreed. Proceeding...

****************************
Updating the building system
****************************
From https://github.com/tbsdtv/media_build
 * tag               latest     -> FETCH_HEAD
Auto-merging v4l/versions.txt
CONFLICT (content): Merge conflict in v4l/versions.txt
error: could not apply e683266... Enable two drivers with backports
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply e683266... Enable two drivers with backports
make: Entering directory '/home/user/src/tbsdtv/media_build/linux'
wget https://github.com/tbsdtv/media_build/releases/download/latest/linux-media.tar.bz2.md5 -O linux-media.tar.bz2.md5.tmp
--2023-12-09 19:40:40--  https://github.com/tbsdtv/media_build/releases/download/latest/linux-media.tar.bz2.md5
Resolving github.com (github.com)... 140.82.121.4
Connecting to github.com (github.com)|140.82.121.4|:443... connected.
HTTP request sent, awaiting response... 302 Found
Location: https://objects.githubusercontent.com/github-production-release-asset-2e65be/61525972/a0884b3b-e946-4614-8657-18bb9812b5fc?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAIWNJYAX4CSVEH53A%2F20231209%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231209T174040Z&X-Amz-Expires=300&X-Amz-Signature=277a2cacb46d19c7e91a21df2a0195eaa9eb8724bc9b1aeaae5c4189096e126f&X-Amz-SignedHeaders=host&actor_id=0&key_id=0&repo_id=61525972&response-content-disposition=attachment%3B%20filename%3Dlinux-media.tar.bz2.md5&response-content-type=application%2Foctet-stream [following]
--2023-12-09 19:40:40--  https://objects.githubusercontent.com/github-production-release-asset-2e65be/61525972/a0884b3b-e946-4614-8657-18bb9812b5fc?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAIWNJYAX4CSVEH53A%2F20231209%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231209T174040Z&X-Amz-Expires=300&X-Amz-Signature=277a2cacb46d19c7e91a21df2a0195eaa9eb8724bc9b1aeaae5c4189096e126f&X-Amz-SignedHeaders=host&actor_id=0&key_id=0&repo_id=61525972&response-content-disposition=attachment%3B%20filename%3Dlinux-media.tar.bz2.md5&response-content-type=application%2Foctet-stream
Resolving objects.githubusercontent.com (objects.githubusercontent.com)... 185.199.110.133, 185.199.111.133, 185.199.108.133, ...
Connecting to objects.githubusercontent.com (objects.githubusercontent.com)|185.199.110.133|:443... connected.
HTTP request sent, awaiting response... 200 OK
Length: 87 [application/octet-stream]
Saving to: ‘linux-media.tar.bz2.md5.tmp’

linux-media.tar.bz2.md5.tmp                            100%[=========================================================================================================================>]      87  --.-KB/s    in 0s      

2023-12-09 19:40:41 (6.30 MB/s) - ‘linux-media.tar.bz2.md5.tmp’ saved [87/87]

cat: linux-media.tar.bz2.md5: No such file or directory
--2023-12-09 19:40:41--  https://github.com/tbsdtv/media_build/releases/download/latest/linux-media.tar.bz2
Resolving github.com (github.com)... 140.82.121.4
Connecting to github.com (github.com)|140.82.121.4|:443... connected.
HTTP request sent, awaiting response... 302 Found
Location: https://objects.githubusercontent.com/github-production-release-asset-2e65be/61525972/ec1190fb-3d56-4220-af4f-080eb22053e5?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAIWNJYAX4CSVEH53A%2F20231209%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231209T174041Z&X-Amz-Expires=300&X-Amz-Signature=194af4280c26a4d35270b432d15826d224c3faae9061adebfe4da35b19fc8126&X-Amz-SignedHeaders=host&actor_id=0&key_id=0&repo_id=61525972&response-content-disposition=attachment%3B%20filename%3Dlinux-media.tar.bz2&response-content-type=application%2Foctet-stream [following]
--2023-12-09 19:40:41--  https://objects.githubusercontent.com/github-production-release-asset-2e65be/61525972/ec1190fb-3d56-4220-af4f-080eb22053e5?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAIWNJYAX4CSVEH53A%2F20231209%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231209T174041Z&X-Amz-Expires=300&X-Amz-Signature=194af4280c26a4d35270b432d15826d224c3faae9061adebfe4da35b19fc8126&X-Amz-SignedHeaders=host&actor_id=0&key_id=0&repo_id=61525972&response-content-disposition=attachment%3B%20filename%3Dlinux-media.tar.bz2&response-content-type=application%2Foctet-stream
Resolving objects.githubusercontent.com (objects.githubusercontent.com)... 185.199.111.133, 185.199.108.133, 185.199.109.133, ...
Connecting to objects.githubusercontent.com (objects.githubusercontent.com)|185.199.111.133|:443... connected.
HTTP request sent, awaiting response... 200 OK
Length: 8262762 (7.9M) [application/octet-stream]
Saving to: ‘linux-media.tar.bz2’

linux-media.tar.bz2                                    100%[=========================================================================================================================>]   7.88M  3.10MB/s    in 2.5s    

2023-12-09 19:40:44 (3.10 MB/s) - ‘linux-media.tar.bz2’ saved [8262762/8262762]

make: Leaving directory '/home/user/src/tbsdtv/media_build/linux'
make: Entering directory '/home/user/src/tbsdtv/media_build/linux'
tar xfj linux-media.tar.bz2
rm -f .patches_applied .linked_dir .git_log.md5
make: Leaving directory '/home/user/src/tbsdtv/media_build/linux'
**********************************************************
* Downloading firmwares from linuxtv.org.                *
**********************************************************
--2023-12-09 19:40:46--  https://github.com/tbsdtv/media_build/releases/download/latest/dvb-firmwares.tar.bz2
Resolving github.com (github.com)... 140.82.121.4
Connecting to github.com (github.com)|140.82.121.4|:443... connected.
HTTP request sent, awaiting response... 302 Found
Location: https://objects.githubusercontent.com/github-production-release-asset-2e65be/61525972/e798a0da-6b8a-461c-850f-845a851b88c6?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAIWNJYAX4CSVEH53A%2F20231209%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231209T174046Z&X-Amz-Expires=300&X-Amz-Signature=b5d78ab75df775f7167c7df9778b05db467a4bdc920138da14d840bc167ef4fd&X-Amz-SignedHeaders=host&actor_id=0&key_id=0&repo_id=61525972&response-content-disposition=attachment%3B%20filename%3Ddvb-firmwares.tar.bz2&response-content-type=application%2Foctet-stream [following]
--2023-12-09 19:40:46--  https://objects.githubusercontent.com/github-production-release-asset-2e65be/61525972/e798a0da-6b8a-461c-850f-845a851b88c6?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAIWNJYAX4CSVEH53A%2F20231209%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231209T174046Z&X-Amz-Expires=300&X-Amz-Signature=b5d78ab75df775f7167c7df9778b05db467a4bdc920138da14d840bc167ef4fd&X-Amz-SignedHeaders=host&actor_id=0&key_id=0&repo_id=61525972&response-content-disposition=attachment%3B%20filename%3Ddvb-firmwares.tar.bz2&response-content-type=application%2Foctet-stream
Resolving objects.githubusercontent.com (objects.githubusercontent.com)... 185.199.111.133, 185.199.108.133, 185.199.109.133, ...
Connecting to objects.githubusercontent.com (objects.githubusercontent.com)|185.199.111.133|:443... connected.
HTTP request sent, awaiting response... 200 OK
Length: 1175964 (1.1M) [application/octet-stream]
Saving to: ‘dvb-firmwares.tar.bz2’

dvb-firmwares.tar.bz2                                  100%[=========================================================================================================================>]   1.12M  3.29MB/s    in 0.3s    

2023-12-09 19:40:47 (3.29 MB/s) - ‘dvb-firmwares.tar.bz2’ saved [1175964/1175964]

dvb-demod-avl6882.fw
dvb-demod-drxk-pctv.fw
dvb-demod-gx1503B.fw
dvb-demod-m88ds3103b.fw
dvb-demod-m88ds3103.fw
dvb-demod-m88rs6000.fw
dvb-demod-m88rs6060.fw
dvb-demod-mn88472-02.fw
dvb-demod-mn88473-01.fw
dvb-demod-si2168-01.fw
dvb-demod-si2168-02.fw
dvb-demod-si2168-a20-01.fw
dvb-demod-si2168-a30-01.fw
dvb-demod-si2168-b40-01.fw
dvb-demod-si2168-d60-01.fw
dvb-demod-si2183-b60-01.fw
dvb-fe-bcm3510-01.fw
dvb-fe-cx24116.fw
dvb-fe-cx24117.fw
dvb-fe-drxj-mc-1.0.8.fw
dvb-fe-drxj-mc-vsb-1.0.8.fw
dvb-fe-drxj-mc-vsb-qam-1.0.8.fw
dvb-fe-ds3000.fw
dvb-fe-ds300x.fw
dvb-fe-ds3103.fw
dvb-fe-mxl58x.fw
dvb-fe-mxl5xx.fw
dvb-fe-or51132-qam.fw
dvb-fe-or51132-vsb.fw
dvb-fe-or51211.fw
dvb-fe-rs6000.fw
dvb-fe-tda10045.fw
dvb-fe-tda10046.fw
dvb-fe-tda10048-1.0.fw
dvb-fe-tda10071.fw
dvb-fe-xc4000-1.4.1.fw
dvb-fe-xc5000-1.6.114.fw
dvb-fe-xc5000c-4.1.30.7.fw
dvb-tuner-si2141-a10-01.fw
dvb-tuner-si2157-a30-01.fw
dvb-tuner-si2157-a30-05.fw
dvb-tuner-si2158-a20-01.fw
dvb-usb-avertv-a800-02.fw
dvb-usb-bluebird-01.fw
dvb-usb-dib0700-1.20.fw
dvb-usb-dibusb-5.0.0.11.fw
dvb-usb-dibusb-6.0.0.8.fw
dvb-usb-dtt200u-01.fw
dvb-usb-dw2101.fw
dvb-usb-dw2102.fw
dvb-usb-dw2104.fw
dvb-usb-dw3101.fw
dvb-usb-id5230.fw
dvb-usb-id5301.fw
dvb-usb-id5520se.fw
dvb-usb-id5530.fw
dvb-usb-id5580.fw
dvb-usb-id5590.fw
dvb-usb-id5930.fw
dvb-usb-id5931.fw
dvb-usb-it9135-01.fw
dvb-usb-it9135-02.fw
dvb-usb-p1100.fw
dvb-usb-p1100-old.fw
dvb-usb-p7500.fw
dvb-usb-pctv-400e-01.fw
dvb-usb-pctv-450e-01.fw
dvb-usb-pctv-452e-01.fw
dvb-usb-s620.fw
dvb-usb-s630.fw
dvb-usb-s660.fw
dvb-usb-sb340.fw
dvb-usb-SkyStar_USB_HD_FW_v17_63.HEX.fw
dvb-usb-tbsqbox-dvbc.fw
dvb-usb-tbsqbox-id2601.fw
dvb-usb-tbsqbox-id5220.fw
dvb-usb-tbsqbox-id5520.fw
dvb-usb-tbsqbox-id5521.fw
dvb-usb-tbsqbox-id5680.fw
dvb-usb-tbsqbox-id5880.fw
dvb-usb-tbsqbox-id5881.fw
dvb-usb-tbsqbox-id5910.fw
dvb-usb-tbsqbox-id5920.fw
dvb-usb-tbsqbox-id5921.fw
dvb-usb-tbsqbox-id5922.fw
dvb-usb-tbsqbox-id5925.fw
dvb-usb-tbsqbox-id5927.fw
dvb-usb-tbsqbox-id5928.fw
dvb-usb-tbsqbox-id5980.fw
dvb-usb-terratec-h5-drxk.fw
dvb-usb-terratec-h7-az6007.fw
dvb-usb-terratec-h7-drxk.fw
dvb-usb-tt-s2400-01.fw
dvb-usb-umt-010-02.fw
dvb-usb-vp702x-01.fw
dvb-usb-vp7045-01.fw
dvb-usb-wt220u-01.fw
dvb-usb-wt220u-02.fw
sms1xxx-hcw-55xxx-dvbt-02.fw
sms1xxx-hcw-55xxx-isdbt-02.fw
sms1xxx-nova-a-dvbt-01.fw
sms1xxx-nova-b-dvbt-01.fw
sms1xxx-stellar-dvbt-01.fw
v4l-cx231xx-avcore-01.fw
v4l-cx23418-apu.fw
v4l-cx23418-cpu.fw
v4l-cx23418-dig.fw
v4l-cx23885-avcore-01.fw
v4l-cx23885-enc-broken.fw
v4l-cx23885-enc.fw
v4l-cx25840.fw
******************
* Start building *
******************
make -C /home/user/src/tbsdtv/media_build/v4l allyesconfig
make[1]: Entering directory '/home/user/src/tbsdtv/media_build/v4l'
No version yet, using 6.1.0-14-amd64
make[2]: Entering directory '/home/user/src/tbsdtv/media_build/linux'
Applying patches for kernel 6.1.0-14-amd64
patch -s -f -N -p1 -i ../backports/api_version.patch
The text leading up to this was:
--------------------------
|diff --git a/drivers/media/cec/cec-api.c b/drivers/media/cec/cec-api.c
|index 10b67fc..64b0250 100644
|--- a/drivers/media/cec/cec-api.c
|+++ b/drivers/media/cec/cec-api.c
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
The text leading up to this was:
--------------------------
|diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
|index 35e81f7..9c3361c 100644
|--- a/drivers/media/media-device.c
|+++ b/drivers/media/media-device.c
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
make[2]: *** [Makefile:132: apply_patches] Error 1
make[2]: Leaving directory '/home/user/src/tbsdtv/media_build/linux'
make[1]: *** [Makefile:386: allyesconfig] Error 2
make[1]: Leaving directory '/home/user/src/tbsdtv/media_build/v4l'
make: *** [Makefile:26: allyesconfig] Error 2
can't select all drivers at ./build line 552
crazycat69 commented 9 months ago

try fresh clone media_build

ritzmann commented 9 months ago

Deleted and cloned media_build: Exactly same error.

crazycat69 commented 9 months ago

https://github.com/tbsdtv/media_build/commit/88764363a3e3d36b3c59a0a2bf2244e262035d47

ritzmann commented 9 months ago

That seems to have done the trick, thanks! I did not do an entirely clean update because Debian pulled the 6.1.0-14 kernel yesterday and released 6.1.0-15 today with a critical bug fix but I doubt that made a difference.

crazycat69 commented 9 months ago

look like this related to your git settings related to merge strategy.