Skip to content
This repository has been archived by the owner on Apr 14, 2024. It is now read-only.

Commit

Permalink
Merge branch 'oscam-svn'
Browse files Browse the repository at this point in the history
  • Loading branch information
WXbet committed Mar 25, 2024
2 parents 472d7c2 + 03f0561 commit 1253b00
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 185 deletions.
1 change: 0 additions & 1 deletion oscam.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,6 @@ static void write_versionfile(bool use_stdout)
write_conf(WEBIF, "Web interface support");
write_conf(WEBIF_LIVELOG, "LiveLog support");
write_conf(WEBIF_JQUERY, "jQuery support intern");
write_conf(TOUCH, "Touch interface support");
write_conf(WITH_SSL, "SSL support");
write_conf(HAVE_DVBAPI, "DVB API support");
if(config_enabled(HAVE_DVBAPI))
Expand Down
18 changes: 5 additions & 13 deletions webif/graph/graph.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

11 comments on commit 1253b00

@Huevos
Copy link

@Huevos Huevos commented on 1253b00 Mar 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@WXbet with this commit the build is broken. Multiple reports of this.

Builds up to 03f0561adec12d8df80452a3b269a6e195708fc8 but not this commit.

ERROR: enigma2-plugin-softcams-oscam-emu-1.20+git-r2 do_configure: ExecutionError('/home/vixdev/6.5/builds/openvix/developer/sf8008m/tmp/work/cortexa15hf-neon-vfpv4-oe-linux-gnueabi/enigma2-plugin-softcams-oscam-emu/enigma2-plugin-softcams-oscam-emu-1.20+git-r2/temp/run.do_configure.1793720', 1, None, None)
ERROR: Logfile of failure stored in: /home/vixdev/6.5/builds/openvix/developer/sf8008m/tmp/work/cortexa15hf-neon-vfpv4-oe-linux-gnueabi/enigma2-plugin-softcams-oscam-emu/enigma2-plugin-softcams-oscam-emu-1.20+git-r2/temp/log.do_configure.1793720
Log data follows:
| DEBUG: Executing python function extend_recipe_sysroot
| NOTE: Direct dependencies are ['/home/vixdev/6.5/meta-oe-alliance/meta-oe/recipes-multimedia/libdvbcsa/libdvbcsa_git.bb:do_populate_sysroot', '/home/vixdev/6.5/meta-openembedded/meta-oe/recipes-support/libusb/libusb-compat_0.1.8.bb:do_populate_sysroot', '/home/vixdev/6.5/openembedded-core/meta/recipes-connectivity/openssl/openssl_3.2.1.bb:do_populate_sysroot', '/home/vixdev/6.5/openembedded-core/meta/recipes-core/glibc/glibc_2.39.bb:do_populate_sysroot', '/home/vixdev/6.5/openembedded-core/meta/recipes-devtools/cmake/cmake-native_3.28.3.bb:do_populate_sysroot', '/home/vixdev/6.5/openembedded-core/meta/recipes-devtools/gcc/gcc-cross_13.2.bb:do_populate_sysroot', '/home/vixdev/6.5/openembedded-core/meta/recipes-devtools/gcc/gcc-runtime_13.2.bb:do_populate_sysroot', '/home/vixdev/6.5/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.67.bb:do_populate_sysroot', 'virtual:native:/home/vixdev/6.5/openembedded-core/meta/recipes-devtools/ninja/ninja_1.11.1.bb:do_populate_sysroot', 'virtual:native:/home/vixdev/6.5/openembedded-core/meta/recipes-devtools/patch/patch_2.7.6.bb:do_populate_sysroot', 'virtual:native:/home/vixdev/6.5/openembedded-core/meta/recipes-devtools/pseudo/pseudo_git.bb:do_populate_sysroot']
| NOTE: Installed into sysroot: []
| NOTE: Skipping as already exists in sysroot: ['linux-libc-headers', 'libdvbcsa', 'libusb-compat', 'openssl', 'gettext-minimal-native', 'glibc', 'binutils-cross-arm', 'cmake-native', 'gcc-cross-arm', 'gcc-runtime', 'libgcc', 'libtool-native', 'm4-native', 'opkg-utils', 'quilt-native', 'texinfo-dummy-native', 'libusb1', 'ucl-native', 'upx-native', 'openssl-native', 'ncurses-native', 'zlib-native', 'flex-native', 'gnu-config-native', 'make-native', 'ninja-native', 'patch-native', 'perl-native', 'pseudo-native', 'bzip2-native', 'xz-native', 'zstd-native', 'attr-native', 'gdbm-native', 'gmp-native', 'libmpc-native', 'mpfr-native', 're2c-native', 'sqlite3-native']
| DEBUG: Python function extend_recipe_sysroot finished
| DEBUG: Executing shell function do_configure
| -- The C compiler identification is GNU 13.2.0
| -- Detecting C compiler ABI info
| -- Detecting C compiler ABI info - done
| -- Check for working C compiler: /home/vixdev/6.5/builds/openvix/developer/sf8008m/tmp/work/cortexa15hf-neon-vfpv4-oe-linux-gnueabi/enigma2-plugin-softcams-oscam-emu/enigma2-plugin-softcams-oscam-emu-1.20+git-r2/recipe-sysroot-native/usr/bin/arm-oe-linux-gnueabi/arm-oe-linux-gnueabi-gcc - skipped
| -- Detecting C compile features
| -- Detecting C compile features - done
| -- Unknown cross system name: <Linux>
| -- Looking for pthread.h
| -- Looking for pthread.h - found
| --   pthread found. Adding pthread support
| -- Looking for openssl/aes.h
| -- Looking for openssl/aes.h - found
| -- Found OpenSSL: /home/vixdev/6.5/builds/openvix/developer/sf8008m/tmp/work/cortexa15hf-neon-vfpv4-oe-linux-gnueabi/enigma2-plugin-softcams-oscam-emu/enigma2-plugin-softcams-oscam-emu-1.20+git-r2/recipe-sysroot/usr/lib/libcrypto.so (found version "3.2.1")
| --   openssl found.
| -- Looking for time.h
| -- Looking for time.h - found
| --   librt found (needed by libusb).
| -- Looking for libusb-1.0/libusb.h
| -- Looking for libusb-1.0/libusb.h - found
| --  libusb 1.0 found (libusb-1.0.so) Adding smartreader support
| CMake Error at CMakeLists.txt:474 (string):
|   string sub-command REGEX, mode MATCHALL needs at least 5 arguments total to
|   command.
| 
| 
| HOSTCC	webif/pages_gen
| GEN	webif/pages.c
| GEN	Compressed 478016 template bytes into 176431 bytes. 301585 saved bytes (63.09%).
| -- The CXX compiler identification is GNU 13.2.0
| -- Detecting CXX compiler ABI info
| -- Detecting CXX compiler ABI info - done
| -- Check for working CXX compiler: /home/vixdev/6.5/builds/openvix/developer/sf8008m/tmp/work/cortexa15hf-neon-vfpv4-oe-linux-gnueabi/enigma2-plugin-softcams-oscam-emu/enigma2-plugin-softcams-oscam-emu-1.20+git-r2/recipe-sysroot-native/usr/bin/arm-oe-linux-gnueabi/arm-oe-linux-gnueabi-g++ - skipped
| -- Detecting CXX compile features
| -- Detecting CXX compile features - done
| -- Looking for math.h
| -- Looking for math.h - found
| status  ARM NEON is disabled, compiling without neon optimization
| -- Utils: operating system: Unknown
| -- Utils: target system: arm-oe-linux-gnueabi
| -- Utils: You selected to disable static libusb system libusb used
| --  utils use system libusb functions
| --
| --
| --   operating system: Unknown
| --   target system: arm-oe-linux-gnueabi
| --   revision:
| --   use system libcrypto functions
| --   use system pthread functions
| --   use system libusb functions
| --   use system libdvbcsa functions
| --
| -- Configuring incomplete, errors occurred!
| WARNING: /home/vixdev/6.5/builds/openvix/developer/sf8008m/tmp/work/cortexa15hf-neon-vfpv4-oe-linux-gnueabi/enigma2-plugin-softcams-oscam-emu/enigma2-plugin-softcams-oscam-emu-1.20+git-r2/temp/run.do_configure.1793720:164 exit 1 from 'cmake -G 'Ninja' -DCMAKE_MAKE_PROGRAM=ninja $oecmake_sitefile /home/vixdev/6.5/builds/openvix/developer/sf8008m/tmp/work/cortexa15hf-neon-vfpv4-oe-linux-gnueabi/enigma2-plugin-softcams-oscam-emu/enigma2-plugin-softcams-oscam-emu-1.20+git-r2/git -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_INSTALL_BINDIR:PATH=bin -DCMAKE_INSTALL_SBINDIR:PATH=sbin -DCMAKE_INSTALL_LIBEXECDIR:PATH=libexec -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc -DCMAKE_INSTALL_SHAREDSTATEDIR:PATH=../com -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var -DCMAKE_INSTALL_LIBDIR:PATH=lib -DCMAKE_INSTALL_INCLUDEDIR:PATH=include -DCMAKE_INSTALL_DATAROOTDIR:PATH=share -DPYTHON_EXECUTABLE:PATH=/usr/bin/python3 -DPython_EXECUTABLE:PATH=/usr/bin/python3 -DPython3_EXECUTABLE:PATH=/usr/bin/python3 -DLIB_SUFFIX= -DCMAKE_INSTALL_SO_NO_EXE=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=/home/vixdev/6.5/builds/openvix/developer/sf8008m/tmp/work/cortexa15hf-neon-vfpv4-oe-linux-gnueabi/enigma2-plugin-softcams-oscam-emu/enigma2-plugin-softcams-oscam-emu-1.20+git-r2/toolchain.cmake -DCMAKE_NO_SYSTEM_FROM_IMPORTED=1 -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON -DFETCHCONTENT_FULLY_DISCONNECTED=ON -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON -DHAVE_PCSC=0 -DWEBIF=1 -DWEBIF_LIVELOG=1 -DWEBIF_JQUERY=1 -DTOUCH=1 -DLCDSUPPORT=1 -DLEDSUPPORT=1 -DWITH_SSL=1 -DWITH_STAPI=0 -DHAVE_LIBUSB=1 -DSTATIC_LIBUSB=0 -DMODULE_CONSTCW=1 -DMODULE_STREAMRELAY=1 -DHAVE_LIBDVBCSA=1 -DIPV6SUPPORT=1 -Wno-dev'
| WARNING: Backtrace (BB generated script):
| 	#1: cmake_do_configure, /home/vixdev/6.5/builds/openvix/developer/sf8008m/tmp/work/cortexa15hf-neon-vfpv4-oe-linux-gnueabi/enigma2-plugin-softcams-oscam-emu/enigma2-plugin-softcams-oscam-emu-1.20+git-r2/temp/run.do_configure.1793720, line 164
| 	#2: do_configure, /home/vixdev/6.5/builds/openvix/developer/sf8008m/tmp/work/cortexa15hf-neon-vfpv4-oe-linux-gnueabi/enigma2-plugin-softcams-oscam-emu/enigma2-plugin-softcams-oscam-emu-1.20+git-r2/temp/run.do_configure.1793720, line 143
| 	#3: main, /home/vixdev/6.5/builds/openvix/developer/sf8008m/tmp/work/cortexa15hf-neon-vfpv4-oe-linux-gnueabi/enigma2-plugin-softcams-oscam-emu/enigma2-plugin-softcams-oscam-emu-1.20+git-r2/temp/run.do_configure.1793720, line 182
NOTE: recipe enigma2-plugin-softcams-oscam-emu-1.20+git-r2: task do_configure: Failed
ERROR: Task (/home/vixdev/6.5/meta-oe-alliance/meta-oe/recipes-distros/openvix/softcams/enigma2-plugin-softcams-oscam-emu.bb:do_configure) failed with exit code '1'

@AbuBaniaz
Copy link
Contributor

@AbuBaniaz AbuBaniaz commented on 1253b00 Mar 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also failing on PLI environment
log.do_configure.zip

This is not working:
https://docs.github.com/en/issues/tracking-your-work-with-issues/creating-an-issue#creating-an-issue-from-a-comment

@Huevos
Copy link

@Huevos Huevos commented on 1253b00 Mar 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fails in OpenViX and OpenBH.

@WXbet
Copy link
Contributor

@WXbet WXbet commented on 1253b00 Mar 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ohmza : Do you have an idea?

USE_UTF8 and TOUCH options were removed.

@WXbet
Copy link
Contributor

@WXbet WXbet commented on 1253b00 Mar 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, the recipe have to remove it. Lets go forward, no step back!

@WXbet
Copy link
Contributor

@WXbet WXbet commented on 1253b00 Mar 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, the recipes have to remove it. Lets go forward, no step back!

@nautilus7
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with @WXbet. Move forward. What did the touch option do anyway?

@AbuBaniaz
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no need for touch. I removed the touch option from ViX, but still did not build. I don't think PLi had it enabled anyway.

@AbuBaniaz
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't find where that is defined, if it is.

@nautilus7
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe the problem with the recipes is #120

@Huevos
Copy link

@Huevos Huevos commented on 1253b00 Mar 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that is the cause. Changed to 755 in the build folder and it works.

Please sign in to comment.