id summary reporter owner description type status priority component severity resolution keywords cc sensitive 4881 Build Error on Ubuntu 20.04 swissAlisha "= Revision OSCam ver: 1.20_svn rev: 11712 = Issue Description reader-videoguard2.c: In function ‘videoguard2_do_ecm’: reader-videoguard2.c:1202:1: error: version control conflict marker in file 1202 | <<<<<<< .mine | ^~~~~~~ reader-videoguard2.c:1199:10: warning: variable ‘chk’ set but not used [-Wunused-but-set-variable] 1199 | int32_t chk; | ^~~ make[1]: *** [Makefile:421: build/aarch64-linux-gnu-ssl/reader-videoguard2.o] Error 1 make[1]: *** Waiting for unfinished jobs.... CC oscam-aes.c CC oscam-array.c make: *** [Makefile:377: all] Error 2 = When the issue occurs Build from Source = How the issue is reproducable Build from Source ___ ____ ___ / _ \/ ___| / __|__ _ _ __ ___ | | | \___ \| | / _` | '_ ` _ \ | |_| |___) | |_| (_| | | | | | | \___/|____/ \___\__,_|_| |_| |_| +------------------------------------------------------------------------------- | OSCam ver: 1.20_svn rev: 11712 target: aarch64-linux-gnu-ssl | Tools: | CROSS = /opt/s3/support/toolchains/native/bin/aarch64-linux-gnu- | CC = /opt/s3/support/toolchains/native/bin/aarch64-linux-gnu-gcc | Settings: | CONF_DIR = /home/oscam/etc | CC_OPTS = -O1 -ggdb -pipe -ffunction-sections -fdata-sections -o nodeadcode | CC_WARN = -W -Wall -Wshadow -Wredundant-decls -Wstrict-prototypes -Wold-style-definition | CFLAGS = -DWITH_SSL=1 -DWITH_LIBCRYPTO=1 -DWITH_UTF8=1 -DWITH_UTF8 | LDFLAGS = -Wl,--gc-sections -DWITH_SSL=1 -DWITH_LIBCRYPTO=1 -DWITH_UTF8=1 -DWITH_UTF8 | LIBS = -lssl -lcrypto -lm -lpthread -ldl | UseFlags = USE_SSL=1 USE_LIBCRYPTO=1 USE_UTF8=1 | Config: | Addons : WEBIF WEBIF_LIVELOG WEBIF_JQUERY WITH_LB CS_CACHEEX CS_CACHEEX_AIO CW_CYCLE_CHECK | Protocols: CAMD35_TCP GBOX | Readers : NAGRA NAGRA_MERLIN IRDETO CONAX CRYPTOWORKS SECA VIACCESS VIDEOGUARD DRE TONGFANG BULCRYPT GRIFFIN DGCRYPT | CardRdrs : | Compiler : aarch64-linux-gnu-gcc (Ubuntu 9.4.0-1ubuntu1~20.04.1) 9.4.0 | Config : build/aarch64-linux-gnu-ssl/config.mak | Binary : /opt/s3/support/binaries/oscam_11712 +------------------------------------------------------------------------------- HOSTCC webif/pages_gen GEN webif/pages.c GEN Compressed 435600 template bytes into 168239 bytes. 267361 saved bytes (61.38%). CC cscrypt/i_cbc.c CC cscrypt/i_ecb.c CC cscrypt/i_skey.c CC cscrypt/md5.c CC cscrypt/des.c CC cscrypt/mdc2.c CC cscrypt/fast_aes.c CC cscrypt/sha256.c CC csctapi/atr.c CC csctapi/icc_async.c CC csctapi/io_serial.c CC csctapi/protocol_t0.c CC csctapi/protocol_t1.c CC minilzo/minilzo.c CC module-cacheex.c CC module-camd35-cacheex.c CC module-camd35.c CC module-cccam-cacheex.c CC module-csp.c CC module-cw-cycle-check.c CC module-gbox-helper.c CC module-gbox-sms.c CC module-gbox-remm.c CC module-gbox-cards.c CC module-gbox.c CC module-stat.c CC module-webif-lib.c CC module-webif-tpl.c CC module-webif.c CC webif/pages.c CC reader-common.c CC reader-bulcrypt.c CC reader-conax.c CC reader-cryptoworks.c CC reader-dgcrypt.c CC reader-dre.c CC reader-dre-cas.c CC reader-dre-common.c CC reader-dre-st20.c CC reader-griffin.c CC reader-irdeto.c CC reader-nagra-common.c CC reader-nagra.c CC reader-nagracak7.c CC reader-seca.c CC reader-tongfang.c CC reader-viaccess.c CC reader-videoguard-common.c CC reader-videoguard1.c CC reader-videoguard12.c CC reader-videoguard2.c reader-videoguard2.c: In function ‘videoguard2_do_ecm’: reader-videoguard2.c:1202:1: error: version control conflict marker in file 1202 | <<<<<<< .mine | ^~~~~~~ reader-videoguard2.c:1199:10: warning: variable ‘chk’ set but not used [-Wunused-but-set-variable] 1199 | int32_t chk; | ^~~ make[1]: *** [Makefile:421: build/aarch64-linux-gnu-ssl/reader-videoguard2.o] Error 1 make[1]: *** Waiting for unfinished jobs.... CC oscam-aes.c CC oscam-array.c make: *** [Makefile:377: all] Error 2" defect closed major Reader high fixed build error swissAlisha 0