JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Add keyring packages to debootstrap

Browse Source 
Adjust extras-buildpkgs README
This commit is contained in:
zador-blood-stained
2016-07-31 13:02:21 +03:00
parent d1f0a0c4ea
commit 5cbd9c3363
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
chroot-buildpackages.sh
View File

@@ -22,11 +22,20 @@ create_chroot()
{ {
display_alert "Creating build chroot" "$RELEASE" "info" display_alert "Creating build chroot" "$RELEASE" "info"
local target_dir="$1" local target_dir="$1"
debootstrap --variant=buildd --arch=$ARCH --foreign \ local includes="ccache,locales,git,ca-certificates,devscripts,libfile-fcntllock-perl,debhelper,rsync,python3"
--include=ccache,locales,git,ca-certificates,devscripts,libfile-fcntllock-perl,debhelper,rsync,python3 \ case $RELEASE in
$RELEASE $target_dir "http://localhost:3142/$APT_MIRROR" jessie)
includes="$includes,debian-keyring,debian-archive-keyring"
;;
xenial)
includes="$includes,ubuntu-keyring"
;;
esac
debootstrap --variant=buildd --arch=$ARCH --foreign --include="$includes" $RELEASE $target_dir "http://localhost:3142/$APT_MIRROR"
[[ $? -ne 0 || ! -f $target_dir/debootstrap/debootstrap ]] && exit_with_error "Create chroot first stage failed" [[ $? -ne 0 || ! -f $target_dir/debootstrap/debootstrap ]] && exit_with_error "Create chroot first stage failed"
cp /usr/bin/$QEMU_BINARY $target_dir/usr/bin/ cp /usr/bin/$QEMU_BINARY $target_dir/usr/bin/
[[ ! -f $target_dir/usr/share/keyrings/debian-archive-keyring.gpg ]] && \
cp /usr/share/keyrings/debian-archive-keyring.gpg $target_dir/usr/share/keyrings/
chroot $target_dir /bin/bash -c "/debootstrap/debootstrap --second-stage" chroot $target_dir /bin/bash -c "/debootstrap/debootstrap --second-stage"
[[ $? -ne 0 || ! -f $target_dir/bin/bash ]] && exit_with_error "Create chroot second stage failed" [[ $? -ne 0 || ! -f $target_dir/bin/bash ]] && exit_with_error "Create chroot second stage failed"
cp $SRC/lib/config/apt/sources.list.$RELEASE $target_dir/etc/apt/sources.list cp $SRC/lib/config/apt/sources.list.$RELEASE $target_dir/etc/apt/sources.list

7
extras-buildpkgs/README.md
View File

@@ -1,5 +1,9 @@
# TODO # TODO
### Process
* Switch from chroot to native multiarch
### Installing packages to images: ### Installing packages to images:
* Add a function for installing packages - **done** * Add a function for installing packages - **done**
@@ -10,7 +14,6 @@
* Add a variable for installing condition (branch, release, desktop, ...) - **done** * Add a variable for installing condition (branch, release, desktop, ...) - **done**
### Building: ### Building:
* Add a function / code to move packages to $DEST/debs/extras - **done** * Add a function / code to move packages to $DEST/debs/extras - **done**
@@ -45,5 +48,7 @@
* hostapd(-realtek): add /etc/hostapd.conf templates * hostapd(-realtek): add /etc/hostapd.conf templates
* mpv: test and add configuration file for direct framebuffer output
## Notes ## Notes
libcedrus compiled without USE_UMP=1 requires access to /dev/ion libcedrus compiled without USE_UMP=1 requires access to /dev/ion