GitHub-Mirror/build
2
0
Fork 0
mirror of https://github.com/Fishwaldo/build.git synced 2025-04-02 04:01:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for patching procedure

Browse source
This commit is contained in:
zador-blood-stained 2016-11-11 14:27:08 +03:00
parent 82215847b7
commit f7b3bb0471
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common.sh
View file

@ -347,8 +347,7 @@ process_patch_file()
local description=$2 local description=$2
# detect and remove files which patch will create # detect and remove files which patch will create
LANGUAGE=english patch --batch --dry-run -p1 -N < $patch | grep create \ lsdiff -s --strip=1 $patch | grep '^+' | awk '{print $2}' | xargs -I % sh -c 'rm -f %'
| awk '{print $NF}' | sed -n 's/,//p' | xargs -I % sh -c 'rm %'
# main patch command # main patch command
echo "Processing file $patch" >> $DEST/debug/patching.log echo "Processing file $patch" >> $DEST/debug/patching.log

2
general.sh
View file

@ -473,7 +473,7 @@ prepare_host()
gawk gcc-arm-linux-gnueabihf gcc-arm-linux-gnueabi qemu-user-static u-boot-tools uuid-dev zlib1g-dev unzip libusb-1.0-0-dev ntpdate \ gawk gcc-arm-linux-gnueabihf gcc-arm-linux-gnueabi qemu-user-static u-boot-tools uuid-dev zlib1g-dev unzip libusb-1.0-0-dev ntpdate \
parted pkg-config libncurses5-dev whiptail debian-keyring debian-archive-keyring f2fs-tools libfile-fcntllock-perl rsync libssl-dev \ parted pkg-config libncurses5-dev whiptail debian-keyring debian-archive-keyring f2fs-tools libfile-fcntllock-perl rsync libssl-dev \
nfs-kernel-server btrfs-tools gcc-aarch64-linux-gnu ncurses-term p7zip-full dos2unix dosfstools libc6-dev-armhf-cross libc6-dev-armel-cross \ nfs-kernel-server btrfs-tools gcc-aarch64-linux-gnu ncurses-term p7zip-full dos2unix dosfstools libc6-dev-armhf-cross libc6-dev-armel-cross \
libc6-dev-arm64-cross curl gcc-arm-none-eabi libnewlib-arm-none-eabi" libc6-dev-arm64-cross curl gcc-arm-none-eabi libnewlib-arm-none-eabi patchutils"
local codename=$(lsb_release -sc) local codename=$(lsb_release -sc)
display_alert "Build host OS release" "${codename:-(unknown)}" "info" display_alert "Build host OS release" "${codename:-(unknown)}" "info"