enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs-tools to btfs-progs (#1613)

Browse Source 
* btrfs-tools to btfs-progs

Signed-off-by: Zhang Ning <832666+zhangn1985@users.noreply.github.com>

* Force rootfs cache recompilation

"Just in case" measure

* Change btrfs-progs in the package base too

* We will build Ubuntu 19.10 rootfs cache as well
This commit is contained in:
zhangn1985 2019-11-03 01:40:46 +08:00 committed by Igor Pečovnik
parent 436ab9ca7d
commit fd5dfeba14
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/configuration.sh
View File

@ -20,11 +20,11 @@ TZDATA=$(cat /etc/timezone) # Timezone for target is taken from host or defined
USEALLCORES=yes # Use all CPU cores for compiling
EXIT_PATCHING_ERROR="" # exit patching if failed
[[ -z $HOST ]] && HOST="$(echo "$BOARD" | cut -f1 -d-)" # set hostname to the board
ROOTFSCACHE_VERSION=12
CHROOT_CACHE_VERSION=6
ROOTFSCACHE_VERSION=13
CHROOT_CACHE_VERSION=7
BUILD_REPOSITORY_URL=$(git remote get-url $(git remote 2>/dev/null) 2>/dev/null)
BUILD_REPOSITORY_COMMIT=$(git describe --match=d_e_a_d_b_e_e_f --always --dirty 2>/dev/null)
ROOTFS_CACHE_MAX=30 # max number of rootfs cache, older ones will be cleaned up
ROOTFS_CACHE_MAX=36 # max number of rootfs cache, older ones will be cleaned up
if [[ $BETA == yes ]]; then
DEB_STORAGE=$DEST/debs-beta
@ -175,7 +175,7 @@ if [[ "$BUILD_MINIMAL" != "yes" ]]; then
# Non-essential packages
PACKAGE_LIST_ADDITIONAL="$PACKAGE_LIST_ADDITIONAL alsa-utils btrfs-tools dosfstools iotop iozone3 stress screen \
PACKAGE_LIST_ADDITIONAL="$PACKAGE_LIST_ADDITIONAL alsa-utils btrfs-progs dosfstools iotop iozone3 stress screen \
ntfs-3g vim pciutils evtest pv libfuse2 libdigest-sha-perl \
libproc-processtable-perl aptitude dnsutils f3 haveged hdparm rfkill vlan bash-completion \
hostapd git ethtool unzip ifenslave command-not-found libpam-systemd iperf3 \

2
lib/general.sh
View File

@ -672,7 +672,7 @@ prepare_host()
local hostdeps="wget ca-certificates device-tree-compiler pv bc lzop zip binfmt-support build-essential ccache debootstrap ntpdate \
gawk gcc-arm-linux-gnueabihf qemu-user-static u-boot-tools uuid-dev zlib1g-dev unzip libusb-1.0-0-dev fakeroot \
parted pkg-config libncurses5-dev whiptail debian-keyring debian-archive-keyring f2fs-tools libfile-fcntllock-perl rsync libssl-dev \
nfs-kernel-server btrfs-tools ncurses-term p7zip-full kmod dosfstools libc6-dev-armhf-cross \
nfs-kernel-server btrfs-progs ncurses-term p7zip-full kmod dosfstools libc6-dev-armhf-cross \
curl patchutils python liblz4-tool libpython2.7-dev linux-base swig libpython-dev aptly acl \
locales ncurses-base pixz dialog systemd-container udev lib32stdc++6 libc6-i386 lib32ncurses5 lib32tinfo5 \
bison libbison-dev flex libfl-dev cryptsetup gpgv1 gnupg1 cpio aria2 pigz dirmngr"