comment buildroot modified files

Signed-off-by: Nicolas Adenis-Lamarre <nicolas.adenis.lamarre@gmail.com>
batocera-linux · Jun 19, 2018 · 73e28a1 · 73e28a1
1 parent 9404178
commit 73e28a1
Show file tree

Hide file tree

Showing 23 changed files with 44 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -691,6 +691,7 @@ target-finalize: ROOTFS=
 target-finalize: $(PACKAGES)
 	@$(call MESSAGE,"Finalizing target directory")
 	# Check files that are touched by more than one package
+	# batocera
 	#./support/scripts/check-uniq-files -t target $(BUILD_DIR)/packages-file-list.txt
 	#./support/scripts/check-uniq-files -t staging $(BUILD_DIR)/packages-file-list-staging.txt
 	#./support/scripts/check-uniq-files -t host $(BUILD_DIR)/packages-file-list-host.txt

diff --git a/Changelog → batocera-Changelog b/Changelog → batocera-Changelog
@@ -10,6 +10,8 @@
 	* es: add an input checker to know how many pads are plugs and which joystick is which player
         * update: libretro-cores leveling with Retroarch 1.7.3
         * update: Dolphin Emulator
+        * better wifi support
+        * better bluetooth support
 
 2018/05/01 - batocera.linux 5.15 - release
         * rpi3+ support

diff --git a/configs/batocera-odroidxu4_defconfig b/configs/batocera-odroidxu4_defconfig
@@ -91,3 +91,4 @@ BR2_PACKAGE_BOOST=y
 BR2_PACKAGE_PYTHON_PSUTIL=y
 BR2_PACKAGE_UBOOT_ODROID_XU4=y
 BR2_PACKAGE_OPENVPN=y
+BR2_PACKAGE_LIBCEC_EXYNOS_API=y
diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
@@ -143,6 +143,7 @@ define HOST_BINUTILS_FIXUP_HARDLINKS
 endef
 HOST_BINUTILS_POST_INSTALL_HOOKS += HOST_BINUTILS_FIXUP_HARDLINKS
 
+# batocera
 BINUTILSUSR_TOOLS = strings
 define HOST_BINUTILSUSR_FIXUP_HARDLINKS
 	$(foreach tool,$(BINUTILSUSR_TOOLS),\

diff --git a/package/dropbear/S50dropbear b/package/dropbear/S50dropbear
@@ -9,6 +9,7 @@ test -r /etc/default/dropbear && . /etc/default/dropbear
 systemsetting="python /usr/lib/python2.7/site-packages/configgen/settings/recalboxSettings.pyc"
 
 start() {
+        # batocera
         enabled="`$systemsetting  -command load -key system.ssh.enabled`"
         if [ "$enabled" == "0" ];then
           echo "SSH services: disabled"

diff --git a/package/eigen/eigen.mk b/package/eigen/eigen.mk
@@ -33,6 +33,7 @@ define EIGEN_INSTALL_STAGING_CMDS
 	$(RM) -r $(EIGEN_DEST_DIR)
 	mkdir -p $(EIGEN_DEST_DIR)
 	cp -a $(@D)/Eigen $(EIGEN_DEST_DIR)
+        # batocera
         cp $(@D)/signature_of_eigen3_matrix_library $(EIGEN_DEST_DIR)
 	$(EIGEN_INSTALL_UNSUPPORTED_MODULES_CMDS)
 	$(INSTALL) -D -m 0644 $(@D)/eigen3.pc \

diff --git a/package/kodi/Config.in b/package/kodi/Config.in
@@ -1,7 +1,8 @@
-config BR2_PACKAGE_KODI_ARCH_SUPPORTS
+fconfig BR2_PACKAGE_KODI_ARCH_SUPPORTS
 	bool
 	default y if BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
 	# i386: needs sse (see upstream PR 10351)
+	# batocera
 	#depends on !(BR2_i386 && !BR2_X86_CPU_HAS_SSE)
 	depends on BR2_USE_MMU # libcdio, and others
 
@@ -95,6 +96,7 @@ if BR2_PACKAGE_KODI
 
 source "package/kodi-platform/Config.in"
 
+# batocera
 config BR2_PACKAGE_KODI_GBM
        bool "gbm"
        depends on BR2_PACKAGE_MESA3D

diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
@@ -254,6 +254,7 @@ else
 KODI_CONF_OPTS += -DENABLE_OPENGL=OFF -DENABLE_X11=OFF
 endif
 
+# batocera
 ifeq ($(BR2_PACKAGE_KODI_GBM),y)
 KODI_DEPENDENCIES += mesa3d
 KODI_CONF_OPTS += -DENABLE_GBM=ON

diff --git a/package/libcec/Config.in b/package/libcec/Config.in
@@ -17,3 +17,9 @@ comment "libcec needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
 		!BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \
 		BR2_STATIC_LIBS
+
+# batocera
+config BR2_PACKAGE_LIBCEC_EXYNOS_API
+       bool "Exynos api"
+       help
+	 Enable Enable api.
diff --git a/package/libcec/libcec.mk b/package/libcec/libcec.mk
@@ -24,7 +24,8 @@ ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
 LIBCEC_DEPENDENCIES += host-swig $(if $(BR2_PACKAGE_PYTHON3),python3,python)
 endif
 
-ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_XU4),y)
+# batocera
+ifeq ($(BR2_PACKAGE_LIBCEC_EXYNOS_API),y)
 LIBCEC_CONF_OPTS += -DHAVE_EXYNOS_API=1
 endif
 

diff --git a/package/libfreeimage/libfreeimage.mk b/package/libfreeimage/libfreeimage.mk
@@ -17,11 +17,13 @@ define LIBFREEIMAGE_EXTRACT_CMDS
 	rmdir $(@D)/FreeImage
 endef
 
+# batocera
 ifeq ($(BR2_ARM_CPU_HAS_NEON)$(BR2_ARM_FPU_FP_ARMV8),y)
 	LIBFREEIMAGE_CFLAGS=$(TARGET_CFLAGS) -DPNG_ARM_NEON_OPT=0
 endif
 
 define LIBFREEIMAGE_BUILD_CMDS
+        # batocera
 	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(LIBFREEIMAGE_CFLAGS)" $(MAKE) -C $(@D)
 endef
 

diff --git a/package/libyaml/libyaml.mk b/package/libyaml/libyaml.mk
@@ -12,4 +12,6 @@ LIBYAML_LICENSE = MIT
 LIBYAML_LICENSE_FILES = LICENSE
 
 $(eval $(autotools-package))
+
+# batocera
 $(eval $(host-package))
diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
@@ -29,6 +29,7 @@ LINUX_FIRMWARE_DIRS += radeon
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.radeon
 endif
 
+# batocera
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_NVIDIA),y)
 LINUX_FIRMWARE_DIRS += nvidia
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.nvidia
@@ -422,6 +423,7 @@ LINUX_FIRMWARE_FILES += iwlwifi-8265-*.ucode
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware
 endif
 
+# batocera
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_ALL),y)
 LINUX_FIRMWARE_FILES += iwlwifi-*.ucode
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware
@@ -536,6 +538,7 @@ LINUX_FIRMWARE_FILES += rsi/rs9113_wlan_qspi.rps
 # which is installed unconditionally
 endif
 
+# batocera
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_S5PMFCV8),y)
 LINUX_FIRMWARE_FILES += s5p-mfc-v8.fw
 endif

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
@@ -80,6 +80,7 @@ define step_pkg_size
 	$(if $(filter install-host,$(2)),\
 		$(if $(filter end,$(1)),$(call step_pkg_size_inner,$(3),$(HOST_DIR),-host)))
 endef
+# batocera
 #GLOBAL_INSTRUMENTATION_HOOKS += step_pkg_size
 
 # Relies on step_pkg_size, so must be after
@@ -92,6 +93,7 @@ define check_bin_arch
 			-a $(BR2_READELF_ARCH_NAME))
 endef
 
+# batocera
 #GLOBAL_INSTRUMENTATION_HOOKS += check_bin_arch
 
 # This hook checks that host packages that need libraries that we build

diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk
@@ -11,7 +11,11 @@ PYTHON_PYYAML_SETUP_TYPE = distutils
 PYTHON_PYYAML_LICENSE = MIT
 PYTHON_PYYAML_LICENSE_FILES = LICENSE
 PYTHON_PYYAML_DEPENDENCIES = libyaml
+
+# batocera
 HOST_PYTHON_PYTYAML_DEPENDENCIES = host-libyaml
 
 $(eval $(python-package))
+
+# batocera
 $(eval $(host-python-package))
diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk
@@ -23,6 +23,7 @@ SDL2_CONF_OPTS += \
 # We must enable static build to get compilation successful.
 SDL2_CONF_OPTS += --enable-static
 
+# batocera
 # sdl2 set the rpi video output from the host name
 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
 SDL2_CONF_OPTS += --host=arm-raspberry-linux-gnueabihf

diff --git a/package/sdl2_mixer/Config.in b/package/sdl2_mixer/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_SDL2_MIXER
 	bool "sdl2_mixer"
 	depends on BR2_PACKAGE_SDL2
+	# batocera - required for mp3
 	select BR2_PACKAGE_LIBMAD
 	help
 	  SDL_mixer is a sample multi-channel audio mixer library.  It

diff --git a/package/sdl2_mixer/sdl2_mixer.mk b/package/sdl2_mixer/sdl2_mixer.mk
@@ -12,6 +12,7 @@ SDL2_MIXER_LICENSE_FILES = COPYING.txt
 SDL2_MIXER_INSTALL_STAGING = YES
 SDL2_MIXER_DEPENDENCIES = sdl2 host-pkgconf
 
+# batocera
 SDL2_MIXER_CONF_OPTS = \
 	--disable-fluidsynth
 
@@ -36,9 +37,11 @@ else
 SDL2_MIXER_CONF_OPTS += --disable-music-ogg-tremor
 endif
 
+# batocera
 SDL2_MIXER_CONF_OPTS += --enable-music-mp3-mad-gpl
 SDL2_MIXER_DEPENDENCIES += libmad
 
+# batocera
 ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
 SDL2_MIXER_DEPENDENCIES += libvorbis
 endif

diff --git a/package/sdl_sound/Config.in b/package/sdl_sound/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_SDL_SOUND
 	bool "SDL_sound"
+	# batocera
 	depends on BR2_PACKAGE_SDL2
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help

diff --git a/package/sdl_sound/sdl_sound.mk b/package/sdl_sound/sdl_sound.mk
@@ -10,6 +10,7 @@ SDL_SOUND_SITE = http://icculus.org/SDL_sound/downloads
 SDL_SOUND_LICENSE = LGPL-2.1+
 SDL_SOUND_LICENSE_FILES = COPYING
 SDL_SOUND_INSTALL_STAGING = YES
+# batocera
 SDL_SOUND_DEPENDENCIES = sdl2
 
 ifneq ($(BR2_ENABLE_LOCALE),y)
@@ -64,12 +65,12 @@ else
 SDL_SOUND_CONF_OPTS += --disable-mmx
 endif
 
+# batocera
 define SDL_SOUND_PATCH_CONFIGURE
 	(cd $(@D); \
 	sed -ie 's/sdl-config/sdl2-config/g' configure \
 	)
 endef
-
 SDL_SOUND_PRE_CONFIGURE_HOOKS += SDL_SOUND_PATCH_CONFIGURE
 
 define SDL_SOUND_REMOVE_PLAYSOUND

diff --git a/package/skeleton-init-common/skeleton-init-common.mk b/package/skeleton-init-common/skeleton-init-common.mk
@@ -69,6 +69,7 @@ endif
 else # !BR2_TARGET_ENABLE_ROOT_LOGIN
 SKELETON_INIT_COMMON_ROOT_PASSWORD = "*"
 endif
+# batocera
 #define SKELETON_INIT_COMMON_SET_ROOT_PASSWD
 #	$(SED) s,^root:[^:]*:,root:$(SKELETON_INIT_COMMON_ROOT_PASSWORD):, $(TARGET_DIR)/etc/shadow
 #endef

diff --git a/package/usbmount/usbmount.mk b/package/usbmount/usbmount.mk
@@ -22,6 +22,8 @@ define USBMOUNT_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0644 -D $(@D)/usbmount.rules $(TARGET_DIR)/lib/udev/rules.d/usbmount.rules
 	$(INSTALL) -m 0644 -D $(@D)/usbmount.conf $(TARGET_DIR)/etc/usbmount/usbmount.conf
 
+        # batocera
+        # mkdir -p $(addprefix $(TARGET_DIR)/media/usb,0 1 2 3 4 5 6 7)
 endef
 
 $(eval $(generic-package))
diff --git a/scripts/linux/buildrootdiff.sh b/scripts/linux/buildrootdiff.sh
@@ -1,10 +1,7 @@
 #!/bin/bash
 
 #BR_LAST_MERGE_COMMIT=8ce27bb9fee80a406a4199657ef90e3c315e7457
-#git checkout ${BR_LAST_MERGE_COMMIT}
-#git checkout -b buildroot-${BR_LAST_MERGE_COMMIT}
-#git checkout master
-#git diff --name-only buildroot-${BR_LAST_MERGE_COMMIT} > buildroot.batocera.diff
+#git diff --name-only $BR_LAST_MERGE_COMMIT > buildroot.batocera.diff
 
 cat buildroot.batocera.diff                              |
     grep -vE '^board/recalbox/'                          | # batocera board