fix oscam target

diff --git a/make/oscam.mk b/make/oscam.mk
index 094c27af55f58834cd0dfd73255107871d7779e0..03d327ab78bfdc38e41454abf05b8f55804ea1d0 100644 (file)
--- a/make/oscam.mk
+++ b/make/oscam.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 # 11760
-OSCAM_GIT = 2e0811d
+OSCAM_GIT = e07195cb
 OSCAM_EMU_PATCH = 68a345a
 
 # https://github.com/oscam-emu/oscam-emu/commits/master
@@ -65,8 +65,9 @@ endif
 
 OSCAM_MAKE_OPTS = \
        CROSS=$(CROSS_DIR)/bin/$(TARGET)- \
+       CC_OPTS="-O2 -ggdb -pipe -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-schedule-insns" \
+       CC_WARN="-W -Wall -Wshadow -Wredundant-decls -Wstrict-prototypes -Wold-style-definition" \
        EXTRA_CFLAGS="-I$(TARGETPREFIX)/include" \
-       EXTRA_CC_OPTS="$(TARGET_O_CFLAGS)" \
        EXTRA_LDFLAGS="-L$(TARGETPREFIX)/lib" \
        \
        CONF_DIR=/var/tuxbox/config
@@ -107,9 +108,9 @@ oscam: oscam_emu_patch $(D)/libusb $(D)/openssl $(D)/libdvbcsa | $(TARGETPREFIX)
        $(REMOVE)/oscam-svn
        if [ -e $(ARCHIVE)/oscam-svn ]; then \
                set -e; cd $(ARCHIVE)/oscam-svn; \
-               git pull; git checkout $(OSCAM_GIT); \
+               git checkout master; git pull; git checkout $(OSCAM_GIT); \
        else \
-               git clone $(OSCAM_URL) $(ARCHIVE)/oscam-svn;\
+               git clone $(OSCAM_URL) $(ARCHIVE)/oscam-svn; \
        fi; \
        cp -r $(ARCHIVE)/oscam-svn $(BUILD_TMP)/oscam-svn
        set -e; cd $(BUILD_TMP)/oscam-svn; \