From 62b56978478663990a4ccb77258b1248fa155270 Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Sat, 3 Sep 2016 16:42:03 +0300 Subject: [PATCH] Update GLshim patch Update patching process verbosity Enable installing additional packages by default --- common.sh | 2 +- compile.sh | 7 ++----- debootstrap-ng.sh | 4 ++-- .../debian/patches/add-install-target.patch | 17 ++++++++++------- extras-buildpkgs/libglshim/debian/rules | 2 +- main.sh | 8 ++++++-- 6 files changed, 22 insertions(+), 18 deletions(-) diff --git a/common.sh b/common.sh index a2af36d13..00afd38dc 100644 --- a/common.sh +++ b/common.sh @@ -318,7 +318,7 @@ process_patch_file() { | awk '{print $NF}' | sed -n 's/,//p' | xargs -I % sh -c 'rm %' # main patch command - echo "Processing file $(basename $patch)" >> $DEST/debug/patching.log + echo "Processing file $patch" >> $DEST/debug/patching.log patch --batch --silent -p1 -N < $patch >> $DEST/debug/patching.log 2>&1 if [[ $? -ne 0 ]]; then diff --git a/compile.sh b/compile.sh index 0b99c5fe1..b8afce3b7 100755 --- a/compile.sh +++ b/compile.sh @@ -25,6 +25,7 @@ DEST_LANG="en_US.UTF-8" # sl_SI.UTF-8, en_US.UTF-8 # advanced KERNEL_KEEP_CONFIG="no" # do not overwrite kernel config before compilation EXTERNAL="yes" # build and install extra applications and drivers +EXTERNAL_NEW="prebuilt" # compile and install or install prebuilt additional packages DEBUG_MODE="no" # wait that you make changes to uboot and kernel source and creates patches FORCE_CHECKOUT="yes" # ignore manual changes to source BUILD_ALL="no" # cycle through available boards and make images or kernel/u-boot packages. @@ -38,10 +39,6 @@ LIB_TAG="" # empty for latest version, # source is where compile.sh is located SRC=$(pwd) -# destination -DEST=$SRC/output -# sources for compilation -SOURCES=$SRC/sources #-------------------------------------------------------------------------------------------------------------------------------- # To preserve proper libraries updating @@ -95,4 +92,4 @@ fi # If you are committing new version of this file, increment VERSION # Only integers are supported -# VERSION=22 +# VERSION=23 diff --git a/debootstrap-ng.sh b/debootstrap-ng.sh index b7d3c1d1e..7738b3855 100644 --- a/debootstrap-ng.sh +++ b/debootstrap-ng.sh @@ -77,9 +77,9 @@ debootstrap_ng() if [[ $RELEASE == jessie || $RELEASE == xenial ]]; then # install locally built packages - [[ $EXTERNAL_NEW == yes ]] && chroot_installpackages_local + [[ $EXTERNAL_NEW == compile ]] && chroot_installpackages_local # install from apt.armbian.com - [[ $EXTERNAL_NEW == nobuild ]] && chroot_installpackages "yes" + [[ $EXTERNAL_NEW == prebuilt ]] && chroot_installpackages "yes" fi # cleanup for install_kernel and install_board_specific diff --git a/extras-buildpkgs/libglshim/debian/patches/add-install-target.patch b/extras-buildpkgs/libglshim/debian/patches/add-install-target.patch index 4003c6968..3a7b43240 100644 --- a/extras-buildpkgs/libglshim/debian/patches/add-install-target.patch +++ b/extras-buildpkgs/libglshim/debian/patches/add-install-target.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4859875..ac23371 100755 +index 13ac06b..2b02ed4 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,9 @@ @@ -13,20 +13,20 @@ index 4859875..ac23371 100755 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) -@@ -34,7 +36,10 @@ if(USE_DRAWTEX) +@@ -35,7 +37,10 @@ if(USE_DRAWTEX) add_definitions(-DUSE_DRAWTEX) endif() -link_directories(${CMAKE_BINARY_DIR}/lib) +set(INSTALL_TARGETS_DEFAULT_ARGS RUNTIME DESTINATION "${BIN_INSTALL_DIR}" -+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" -+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") + - add_definitions(-g -std=gnu99 -funwind-tables -O3) + add_definitions(-g -std=gnu99 -funwind-tables -O3 -fvisibility=hidden) include_directories(include) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 4cb3b30..21cffcc 100755 +index 4cb3b30..af95bfd 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -16,9 +16,11 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") @@ -44,7 +44,7 @@ index 4cb3b30..21cffcc 100755 aux_source_directory(preload PRELOAD_SOURCES) add_library(preload SHARED ${PRELOAD_SOURCES}) -@@ -27,3 +29,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") +@@ -27,3 +29,10 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") endif() add_subdirectory(proxy) @@ -52,3 +52,6 @@ index 4cb3b30..21cffcc 100755 +INSTALL(TARGETS GL + ${INSTALL_TARGETS_DEFAULT_ARGS} +) ++ ++install(TARGETS preload ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/glshim_preload") diff --git a/extras-buildpkgs/libglshim/debian/rules b/extras-buildpkgs/libglshim/debian/rules index 2695aa120..69dd0068e 100644 --- a/extras-buildpkgs/libglshim/debian/rules +++ b/extras-buildpkgs/libglshim/debian/rules @@ -6,7 +6,7 @@ override_dh_auto_configure: dh_auto_configure -- -DCMAKE_VERBOSE_MAKEFILE=OFF override_dh_auto_build: - dh_auto_build -- GL + dh_auto_build -- GL preload %: dh $@ diff --git a/main.sh b/main.sh index a8d5a44a9..dcb781db2 100644 --- a/main.sh +++ b/main.sh @@ -11,7 +11,11 @@ # # Main program # -# + +# destination +DEST=$SRC/output +# sources for compilation +SOURCES=$SRC/sources TTY_X=$(($(stty size | awk '{print $2}')-6)) # determine terminal width TTY_Y=$(($(stty size | awk '{print $1}')-6)) # determine terminal height @@ -229,7 +233,7 @@ VER="${VER/-$LINUXFAMILY/}" [[ -n $RELEASE ]] && create_board_package # chroot-buildpackages -[[ $EXTERNAL_NEW == yes ]] && chroot_build_packages +[[ $EXTERNAL_NEW == compile ]] && chroot_build_packages if [[ $KERNEL_ONLY != yes ]]; then debootstrap_ng