Changeset 17666 in niluje


Ignore:
Timestamp:
Aug 1, 2020, 7:09:44 AM (11 days ago)
Author:
NiLuJe
Message:

Revert r17657

Location:
Configs/trunk/Kindle
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • Configs/trunk/Kindle/Hacks/Fonts/src/build-updates.sh

    r17657 r17666  
    136136                # NOTE: This isn't particularly pretty, and we end up bundling only one version of the binaries in the zip files, but at least the .bin files end up with the correct set of binaries ;)
    137137                # K4/K5 binaries...
    138                 KINDLE_MODEL_BINARIES="bin/fc-scan bin/shlock lib/autohint/libfreetype.so lib/bci/libfreetype.so lib/light/libfreetype.so lib/libharfbuzz.so.0 lib/libexpat.so.1 lib/libfontconfig.so.1 lib/libz.so lib/libfreetype.so.6 lib/libuuid.so.1"
     138                KINDLE_MODEL_BINARIES="bin/fc-scan bin/shlock lib/autohint/libfreetype.so lib/bci/libfreetype.so lib/light/libfreetype.so lib/libharfbuzz.so.0 lib/libexpat.so.1 lib/libfontconfig.so.1 lib/libz.so.1 lib/libfreetype.so.6 lib/libuuid.so.1"
    139139
    140140                # Archive custom directory
  • Configs/trunk/Kindle/Hacks/ScreenSavers/src/build-updates.sh

    r17657 r17666  
    112112                # NOTE: This isn't particularly pretty, and we end up bundling only one version of the binaries in the zip files, but at least the .bin files end up with the correct set of binaries ;)
    113113                # K4/K5 binaries...
    114                 KINDLE_MODEL_BINARIES="bin/convert bin/mogrify bin/identify bin/inotifywait bin/shlock bin/sort lib/libz.so lib/libpng16.so.16 lib/libharfbuzz.so.0 lib/libfreetype.so.6 lib/libturbojpeg.so.0 lib/libjpeg.so.62 lib/libMagickWand-6.Q8.so.6 lib/libMagickCore-6.Q8.so.6 bin/mobicover"
     114                KINDLE_MODEL_BINARIES="bin/convert bin/mogrify bin/identify bin/inotifywait bin/shlock bin/sort lib/libz.so.1 lib/libpng16.so.16 lib/libharfbuzz.so.0 lib/libfreetype.so.6 lib/libturbojpeg.so.0 lib/libjpeg.so.62 lib/libMagickWand-6.Q8.so.6 lib/libMagickCore-6.Q8.so.6 bin/mobicover"
    115115
    116116                # Archive custom directory
  • Configs/trunk/Kindle/Hacks/USBNetwork/src/build-updates.sh

    r17657 r17666  
    9393                # NOTE: This isn't particularly pretty, and we end up bundling only one version of the binaries in the zip files, but at least the .bin files end up with the correct set of binaries ;)
    9494                # K4/K5 binaries...
    95                 KINDLE_MODEL_BINARIES="bin/busybox bin/dropbearmulti bin/htop bin/kindletool bin/kindle_usbnet_addr bin/lsof bin/mosh-client bin/mosh-server bin/rsync bin/scp bin/sftp bin/ssh bin/ssh-add bin/ssh-agent bin/sshfs bin/ssh-keygen bin/ssh-keyscan libexec/sftp-server libexec/ssh-keysign libexec/ssh-pkcs11-helper libexec/ssh-sk-helper sbin/sshd bin/fbgrab bin/strace bin/eu-nm bin/eu-objdump bin/eu-strings lib/libasm.so.1 lib/libdw.so.1 lib/libelf.so.1 lib/libz.so lib/libpng16.so.16 lib/libncurses.so.6 lib/libtinfo.so.6 lib/libncursesw.so.6 lib/libtinfow.so.6 lib/libunwind-arm.so.8 lib/libunwind-ptrace.so.0 lib/libunwind.so.8 bin/nano bin/zsh lib/libmagic.so.1 lib/libpcre.so.1 lib/libpcreposix.so.0"
     95                KINDLE_MODEL_BINARIES="bin/busybox bin/dropbearmulti bin/htop bin/kindletool bin/kindle_usbnet_addr bin/lsof bin/mosh-client bin/mosh-server bin/rsync bin/scp bin/sftp bin/ssh bin/ssh-add bin/ssh-agent bin/sshfs bin/ssh-keygen bin/ssh-keyscan libexec/sftp-server libexec/ssh-keysign libexec/ssh-pkcs11-helper libexec/ssh-sk-helper sbin/sshd bin/fbgrab bin/strace bin/eu-nm bin/eu-objdump bin/eu-strings lib/libasm.so.1 lib/libdw.so.1 lib/libelf.so.1 lib/libz.so.1 lib/libpng16.so.16 lib/libncurses.so.6 lib/libtinfo.so.6 lib/libncursesw.so.6 lib/libtinfow.so.6 lib/libunwind-arm.so.8 lib/libunwind-ptrace.so.0 lib/libunwind.so.8 bin/nano bin/zsh lib/libmagic.so.1 lib/libpcre.so.1 lib/libpcreposix.so.0"
    9696                KINDLE_MODEL_BINARIES="${KINDLE_MODEL_BINARIES} lib/zsh/attr.so lib/zsh/cap.so lib/zsh/clone.so lib/zsh/compctl.so lib/zsh/complete.so lib/zsh/complist.so lib/zsh/computil.so lib/zsh/curses.so lib/zsh/datetime.so lib/zsh/deltochar.so lib/zsh/example.so lib/zsh/files.so lib/zsh/langinfo.so lib/zsh/mapfile.so lib/zsh/mathfunc.so lib/zsh/nearcolor.so lib/zsh/newuser.so lib/zsh/parameter.so lib/zsh/pcre.so lib/zsh/regex.so lib/zsh/rlimits.so lib/zsh/sched.so lib/zsh/stat.so lib/zsh/system.so lib/zsh/termcap.so lib/zsh/terminfo.so lib/zsh/zftp.so lib/zsh/zleparameter.so lib/zsh/zle.so lib/zsh/zprof.so lib/zsh/zpty.so lib/zsh/zselect.so lib/zsh/zutil.so lib/zsh/net/socket.so lib/zsh/net/tcp.so lib/zsh/param/private.so"
    9797                KINDLE_MODEL_BINARIES="${KINDLE_MODEL_BINARIES} bin/dircolors bin/ag lib/libevent-2.1.so.7 lib/libevent_core-2.1.so.7 lib/libevent_extra-2.1.so.7 lib/libevent_openssl-2.1.so.7 lib/libevent_pthreads-2.1.so.7 bin/tmux bin/gdb bin/gdbserver bin/objdump bin/gprof bin/fbink bin/fbdepth"
  • Configs/trunk/Kindle/Hacks/USBNetwork/src/install.sh

    r17657 r17666  
    236236otautils_update_progressbar
    237237
    238 logmsg "I" "install" "" "removing deprecated libraries (v0.57.N)"
    239 LIST="libz.so.1"
    240 for var in ${LIST} ; do
    241     if [ -f ${USBNET_LIBDIR}/${var} ] ; then
    242         echo "deprecated library ${USBNET_LIBDIR}/${var} exists, deleting..." >> ${USBNET_LOG}
    243         rm -f ${USBNET_LIBDIR}/${var}
    244     fi
    245 done
    246 
    247 otautils_update_progressbar
    248 
    249238# From v0.57.N
    250239logmsg "I" "install" "" "removing deprecated zsh symlink (v0.57.N)"
  • Configs/trunk/Kindle/Kobo_Hacks/KoboStuff/build/build-updates.sh

    r17657 r17666  
    102102done
    103103# We also need libz
    104 cp -av mnt/onboard/.niluje/usbnet/lib/libz.so usr/local/niluje/usbnet/lib/libz.so
     104cp -av mnt/onboard/.niluje/usbnet/lib/libz.so.1 usr/local/niluje/usbnet/lib/libz.so.1
    105105# And OpenSSL for OpenSSH
    106106cp -av mnt/onboard/.niluje/usbnet/lib/libcrypto.so.1.1 usr/local/niluje/usbnet/lib/libcrypto.so.1.1
  • Configs/trunk/Kindle/Touch_Hacks/Fonts/build/build-updates.sh

    r17657 r17666  
    9090${TAR_BIN} --hard-dereference --owner root --group root --exclude-vcs -cvf ${HACKNAME}.tar ../src/${HACKNAME} ../src/extensions
    9191# Delete A8 binaries
    92 KINDLE_MODEL_BINARIES="bin/fc-scan bin/fc-list bin/shlock lib/autohint/libfreetype.so lib/bci/libfreetype.so lib/light/libfreetype.so lib/spr/libfreetype.so lib/libharfbuzz.so.0 lib/libexpat.so.1 lib/libfontconfig.so.1 lib/libz.so lib/libfreetype.so.6 lib/libuuid.so.1"
     92KINDLE_MODEL_BINARIES="bin/fc-scan bin/fc-list bin/shlock lib/autohint/libfreetype.so lib/bci/libfreetype.so lib/light/libfreetype.so lib/spr/libfreetype.so lib/libharfbuzz.so.0 lib/libexpat.so.1 lib/libfontconfig.so.1 lib/libz.so.1 lib/libfreetype.so.6 lib/libuuid.so.1"
    9393for my_bin in ${KINDLE_MODEL_BINARIES} ; do
    9494        ${TAR_BIN} --delete -vf ${HACKNAME}.tar src/${HACKNAME}/${my_bin}
  • Configs/trunk/Kindle/Touch_Hacks/ScreenSavers/build/build-updates.sh

    r17657 r17666  
    102102${TAR_BIN} --hard-dereference --owner root --group root --exclude-vcs -cvf ${HACKNAME}.tar ../src/${HACKNAME} ../src/extensions
    103103# Delete A8 binaries
    104 KINDLE_MODEL_BINARIES="bin/convert bin/mogrify bin/identify bin/inotifywait bin/shlock bin/sort lib/libz.so lib/libpng16.so.16 lib/libharfbuzz.so.0 lib/libfreetype.so.6 lib/libturbojpeg.so.0 lib/libjpeg.so.62 lib/libMagickWand-6.Q8.so.6 lib/libMagickCore-6.Q8.so.6 bin/mobicover"
     104KINDLE_MODEL_BINARIES="bin/convert bin/mogrify bin/identify bin/inotifywait bin/shlock bin/sort lib/libz.so.1 lib/libpng16.so.16 lib/libharfbuzz.so.0 lib/libfreetype.so.6 lib/libturbojpeg.so.0 lib/libjpeg.so.62 lib/libMagickWand-6.Q8.so.6 lib/libMagickCore-6.Q8.so.6 bin/mobicover"
    105105for my_bin in ${KINDLE_MODEL_BINARIES} ; do
    106106        ${TAR_BIN} --delete -vf ${HACKNAME}.tar src/${HACKNAME}/${my_bin}
  • Configs/trunk/Kindle/Touch_Hacks/USBNetwork/build/build-updates.sh

    r17657 r17666  
    8484${TAR_BIN} --hard-dereference --owner root --group root --exclude-vcs -cvf ${HACKNAME}.tar ../src/${HACKNAME} ../src/extensions
    8585# Delete A8 binaries
    86 KINDLE_MODEL_BINARIES="bin/busybox bin/dropbearmulti bin/htop bin/kindletool bin/kindle_usbnet_addr bin/lsof bin/mosh-client bin/mosh-server bin/rsync bin/scp bin/sftp bin/ssh bin/ssh-add bin/ssh-agent bin/sshfs bin/ssh-keygen bin/ssh-keyscan lib/libcrypto.so.1.1 lib/libssl.so.1.1 libexec/sftp-server libexec/ssh-keysign libexec/ssh-pkcs11-helper libexec/ssh-sk-helper sbin/sshd bin/fbgrab bin/strace bin/eu-nm bin/eu-objdump bin/eu-readelf bin/eu-strings bin/ltrace lib/libasm.so.1 lib/libdw.so.1 lib/libelf.so.1 lib/libz.so lib/libpng16.so.16 lib/libncurses.so.6 lib/libtinfo.so.6 lib/libncursesw.so.6 lib/libtinfow.so.6 lib/libunwind-arm.so.8 lib/libunwind-ptrace.so.0 lib/libunwind.so.8 bin/nano bin/zsh lib/libmagic.so.1 lib/libpcre.so.1 lib/libpcreposix.so.0"
     86KINDLE_MODEL_BINARIES="bin/busybox bin/dropbearmulti bin/htop bin/kindletool bin/kindle_usbnet_addr bin/lsof bin/mosh-client bin/mosh-server bin/rsync bin/scp bin/sftp bin/ssh bin/ssh-add bin/ssh-agent bin/sshfs bin/ssh-keygen bin/ssh-keyscan lib/libcrypto.so.1.1 lib/libssl.so.1.1 libexec/sftp-server libexec/ssh-keysign libexec/ssh-pkcs11-helper libexec/ssh-sk-helper sbin/sshd bin/fbgrab bin/strace bin/eu-nm bin/eu-objdump bin/eu-readelf bin/eu-strings bin/ltrace lib/libasm.so.1 lib/libdw.so.1 lib/libelf.so.1 lib/libz.so.1 lib/libpng16.so.16 lib/libncurses.so.6 lib/libtinfo.so.6 lib/libncursesw.so.6 lib/libtinfow.so.6 lib/libunwind-arm.so.8 lib/libunwind-ptrace.so.0 lib/libunwind.so.8 bin/nano bin/zsh lib/libmagic.so.1 lib/libpcre.so.1 lib/libpcreposix.so.0"
    8787KINDLE_MODEL_BINARIES="${KINDLE_MODEL_BINARIES} lib/zsh/attr.so lib/zsh/cap.so lib/zsh/clone.so lib/zsh/compctl.so lib/zsh/complete.so lib/zsh/complist.so lib/zsh/computil.so lib/zsh/curses.so lib/zsh/datetime.so lib/zsh/deltochar.so lib/zsh/example.so lib/zsh/files.so lib/zsh/langinfo.so lib/zsh/mapfile.so lib/zsh/mathfunc.so lib/zsh/nearcolor.so lib/zsh/newuser.so lib/zsh/parameter.so lib/zsh/pcre.so lib/zsh/regex.so lib/zsh/rlimits.so lib/zsh/sched.so lib/zsh/stat.so lib/zsh/system.so lib/zsh/termcap.so lib/zsh/terminfo.so lib/zsh/zftp.so lib/zsh/zleparameter.so lib/zsh/zle.so lib/zsh/zprof.so lib/zsh/zpty.so lib/zsh/zselect.so lib/zsh/zutil.so lib/zsh/net/socket.so lib/zsh/net/tcp.so lib/zsh/param/private.so"
    8888KINDLE_MODEL_BINARIES="${KINDLE_MODEL_BINARIES} bin/dircolors bin/ag lib/libevent-2.1.so.7 lib/libevent_core-2.1.so.7 lib/libevent_extra-2.1.so.7 lib/libevent_openssl-2.1.so.7 lib/libevent_pthreads-2.1.so.7 bin/tmux bin/gdb bin/gdbserver bin/objdump bin/gprof bin/fbink bin/fbdepth"
  • Configs/trunk/Kindle/Touch_Hacks/USBNetwork/src/install.sh

    r17657 r17666  
    231231otautils_update_progressbar
    232232
    233 logmsg "I" "install" "" "removing deprecated libraries (v0.22.N)"
    234 LIST="libz.so.1"
    235 for var in ${LIST} ; do
    236     if [ -f ${USBNET_LIBDIR}/${var} ] ; then
    237         echo "deprecated library ${USBNET_LIBDIR}/${var} exists, deleting..." >> ${USBNET_LOG}
    238         rm -f ${USBNET_LIBDIR}/${var}
    239     fi
    240 done
    241 
    242 otautils_update_progressbar
    243 
    244233# Make sure our custom binaries are executable
    245234LIST="busybox dropbearmulti htop kindletool kindle_usbnet_addr lsof mosh-client mosh-server rsync rsync-ssl scp sftp ssh ssh-add ssh-agent sshfs ssh-keygen ssh-keyscan usbnet-link usbnetwork fbgrab"
Note: See TracChangeset for help on using the changeset viewer.