qiurui
/
armbian-build
mirror of https://github.com/armbian/build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update armbian-config packaging

This commit is contained in:
zador-blood-stained 2017-11-12 13:35:27 +03:00
parent 96324893b3
commit 42e1ee8330
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/main.sh
View File

@ -255,7 +255,6 @@ if [[ $IGNORE_UPDATES != yes ]]; then
fetch_from_repo "$ATFSOURCE" "$ATFDIR" "$ATFBRANCH" "yes"
fi
fetch_from_repo "https://github.com/linux-sunxi/sunxi-tools" "sunxi-tools" "branch:master"
fetch_from_repo "https://github.com/armbian/config" "armbian-config" "branch:dev"
fetch_from_repo "https://github.com/rockchip-linux/rkbin" "rkbin-tools" "branch:master"
fetch_from_repo "https://github.com/MarvellEmbeddedProcessors/A3700-utils-marvell" "marvell-tools" "branch:A3700_utils-armada-17.10"
fetch_from_repo "https://github.com/armbian/odroidc2-blobs" "odroidc2-blobs" "branch:master"

7
lib/makeboarddeb.sh
View File

@ -136,13 +136,6 @@ create_board_package()
# this is required for NFS boot to prevent deconfiguring the network on shutdown
[[ $RELEASE == xenial || $RELEASE == stretch ]] && sed -i 's/#no-auto-down/no-auto-down/g' $destination/etc/network/interfaces.default
# armbian-config
#install -m 755 $SRC/cache/sources/armbian-config/scripts/tv_grab_file $destination/usr/bin/tv_grab_file
#install -m 755 $SRC/cache/sources/armbian-config/debian-config $destination/usr/bin/armbian-config
#install -m 755 $SRC/cache/sources/armbian-config/debian-config-jobs $destination/usr/bin/armbian-config-jobs
#install -m 755 $SRC/cache/sources/armbian-config/debian-config-submenu $destination/usr/bin/armbian-config-submenu
#install -m 755 $SRC/cache/sources/armbian-config/softy $destination/usr/bin/softy
# install copy of boot script & environment file
local bootscript_src=${BOOTSCRIPT%%:*}
local bootscript_dst=${BOOTSCRIPT##*:}

16
packages/extras/armbian-config.sh
View File

@ -15,7 +15,7 @@ compile_armbian-config()
fetch_from_repo "https://github.com/armbian/config" "armbian-config" "branch:dev"
mkdir -p $tmpdir/{DEBIAN,/usr/bin/}
mkdir -p $tmpdir/{DEBIAN,usr/bin/,usr/sbin/,usr/lib/armbian-config/}
# set up control file
cat <<-END > $tmpdir/DEBIAN/control
@ -24,17 +24,21 @@ compile_armbian-config()
Architecture: all
Maintainer: $MAINTAINER <$MAINTAINERMAIL>
Replaces: armbian-bsp
Depends: bc, expect, rcconf, dialog, network-manager
Depends: bash, bc, expect, rcconf, dialog
Recommends: network-manager, armbian-bsp
Section: utils
Priority: optional
Description: Armbian configuration utility
END
install -m 755 $SRC/cache/sources/armbian-config/scripts/tv_grab_file $tmpdir/usr/bin/tv_grab_file
install -m 755 $SRC/cache/sources/armbian-config/debian-config $tmpdir/usr/bin/armbian-config
install -m 644 $SRC/cache/sources/armbian-config/debian-config-jobs $tmpdir/usr/bin/armbian-config-jobs
install -m 644 $SRC/cache/sources/armbian-config/debian-config-submenu $tmpdir/usr/bin/armbian-config-submenu
install -m 755 $SRC/cache/sources/armbian-config/softy $tmpdir/usr/bin/softy
install -m 755 $SRC/cache/sources/armbian-config/debian-config $tmpdir/usr/sbin/armbian-config
install -m 644 $SRC/cache/sources/armbian-config/debian-config-jobs $tmpdir/usr/lib/armbian-config/jobs.sh
install -m 644 $SRC/cache/sources/armbian-config/debian-config-submenu $tmpdir/usr/lib/armbian-config/submenu.sh
install -m 755 $SRC/cache/sources/armbian-config/softy $tmpdir/usr/sbin/softy
# fallback to replace armbian-config in BSP
ln -sf /usr/sbin/armbian-config $tmpdir/usr/bin/armbian-config
ln -sf /usr/sbin/softy $tmpdir/usr/bin/softy
fakeroot dpkg -b ${tmpdir} >/dev/null
mv ${tmpdir}.deb $DEST/debs