Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes needed to use crossbuilder on manjaro #59

Merged
merged 10 commits into from
Oct 29, 2021
Merged

Changes needed to use crossbuilder on manjaro #59

Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3468b22
Changes needed to use crossbuilder on manjaro
jezek Sep 12, 2021
0441ac1
Container ensurement comment clarification.
jezek Sep 29, 2021
f1d37c7
Move "dpkg-architecture" command usage entirely into container
jezek Sep 29, 2021
a2f141f
Modify starting lxd echo text
jezek Sep 29, 2021
22cb838
Simplify user and group id detection
jezek Sep 29, 2021
11683b8
Detect package review fixes
jezek Oct 1, 2021
8e4e8a3
Move host architecture detection to function, remove exotic architect…
jezek Oct 5, 2021
449422a
Remove adding user sub[g,u]id at lxd initialization, fix root sub[u,g…
jezek Oct 7, 2021
dc04c24
lxd service run detection rewrite, introducing lxd_service_action fun…
jezek Oct 16, 2021
8d4d89c
LXD service detection fixes
jezek Oct 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
205 changes: 168 additions & 37 deletions crossbuilder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,17 +145,12 @@ variables () {
SOURCE_PATH_LOCAL=$MOUNTED_DIRECTORY
SOURCE_PATH_CONTAINER=$MOUNT_POINT
POST_DEPLOY_SCRIPT=.crossbuilder/post_deploy
HOST_FARCH=$(dpkg-architecture -f -a$HOST_ARCH -qDEB_BUILD_MULTIARCH)
TARGET_FARCH=$(dpkg-architecture -f -a$TARGET_ARCH -qDEB_HOST_MULTIARCH)
if [ "$(dpkg-architecture -f -a$TARGET_ARCH -qDEB_BUILD_ARCH)" != "$TARGET_ARCH" ]; then
DEB_BUILD_PROFILES="cross nocheck nodoc noudeb"
EXTRA_DEB_BUILD_OPTIONS="nocheck nodoc noudeb"
else
DEB_BUILD_PROFILES="noudeb"
EXTRA_DEB_BUILD_OPTIONS="noudeb"
fi
TMP_DIR="$(mktemp -d --tmpdir crossbuilder.XXXXXX)"
trap "rm -r $TMP_DIR" HUP INT TERM QUIT EXIT

unset HOST_FARCH TARGET_FARCH DEB_BUILD_PROFILES EXTRA_DEB_BUILD_OPTIONS
# To set the HOST_FARCH, TARGET_FARCH, DEB_BUILD_PROFILES and EXTRA_DEB_BUILD_OPTIONS variables,
# you need to call the "ensure_container" function.
}

check_lxd_accessible () {
Expand All @@ -167,6 +162,12 @@ check_lxd_accessible () {
exit 1
fi

# On some distros the lxd is not runnig by default. Start if not started.
if which systemctl > /dev/null 2>&1 && ! sudo systemctl status lxd > /dev/null 2>&1 ; then
mardy marked this conversation as resolved.
Show resolved Hide resolved
echo "Starting LXD"
sudo systemctl start lxd
fi

if ! lxc info > /dev/null 2>&1 ; then
echo -e "${ERROR_COLOR}LXD was installed but is not accessible."
echo "Check the 'lxd' group exists and you are a member, then restart your computer."
Expand All @@ -186,30 +187,50 @@ lxd_has_image_or_container () {
}

is_subuid_setup () {
if ! grep "root:1000:1" /etc/subuid > /dev/null ; then
local USER_ID=$1
local GROUP_ID=$2
if ! grep "root:${USER_ID}:1" /etc/subuid > /dev/null ; then
return 1
fi
if ! grep "root:1000:1" /etc/subgid > /dev/null ; then
if ! grep "root:${GROUP_ID}:1" /etc/subgid > /dev/null ; then
return 1
fi
return 0
}

ensure_lxd_subuid () {
if test -z "$FORCE_PRIVILEGED" && ! is_subuid_setup ; then
# Fetch user id and his group id to correctly setup subuid/subgid.
local USER_ID=$(id -u)
local GROUP_ID=$(id -g)
if test -z "$FORCE_PRIVILEGED" && ! is_subuid_setup $USER_ID $GROUP_ID ; then
echo -e "${ERROR_COLOR}LXD requires subuid to be setup adequately to mount directories in containers.${NC}"
echo -e "${POSITIVE_COLOR}Would you like to do that now? (y/n) ${NC}"
read REPLY
echo
if [ "$REPLY" = y ]
then
sudo usermod --add-subuids 1000-1000 root
sudo usermod --add-subgids 1000-1000 root
if which service > /dev/null ; then
# Setup subuid.
if [ ! -f "/etc/subuid" ] ; then
sudo touch /etc/subuid
fi
sudo usermod --add-subuids "${USER_ID}-${USER_ID}" root
sudo usermod --add-subuids "100000-165535" root

# Setup subgid.
if [ ! -f "/etc/subgid" ] ; then
sudo touch /etc/subgid
fi
sudo usermod --add-subgids "${GROUP_ID}-${GROUP_ID}" root
sudo usermod --add-subgids "100000-165535" root

if which service > /dev/null 2>&1; then
echo "sudo service lxd restart"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just "Restarting LXD", and you can move it outside of the if condition (removing the other two echos below)

sudo service lxd restart
elif which snap > /dev/null && snap connections lxd > /dev/null ; then
elif which snap > /dev/null 2>&1 && snap connections lxd > /dev/null 2>&1 ; then
echo "sudo snap restart lxd"
sudo snap restart lxd
else
elif which systemctl > /dev/null 2>&1 ; then
echo "sudo systemctl restart lxd"
sudo systemctl restart lxd
fi
else
Expand Down Expand Up @@ -250,7 +271,16 @@ setup_lxd () {
then
if ! which zpool > /dev/null ; then
echo -e "${POSITIVE_COLOR}Installing ZFS.${NC}"
sudo apt-get install -y zfsutils-linux
if which apt-get > /dev/null 2>&1 ; then
echo "sudo apt-get install -y zfsutils-linux"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just "Installing ZFS utils" outside of the condition.

sudo apt-get install -y zfsutils-linux
elif which pacman > /dev/null 2>&1 ; then
echo "sudo pacman -Syu zfs-utils"
sudo pacman -Syu zfs-utils
else
echo -e "${ERROR_COLOR}No known package manager found to install zfs utilities.${NC}"
exit 1
fi
fi
LXD_POOL=~/zfs/lxd.img
echo -e "${POSITIVE_COLOR}Creating file $LXD_POOL to contain all of LXD's images and containers.${NC}"
Expand Down Expand Up @@ -350,6 +380,18 @@ nonsdk_container_setup () {
esac
}

detect_farch_and_build_params_in_container () {
HOST_FARCH=$(exec_container dpkg-architecture -f -a$HOST_ARCH -qDEB_BUILD_MULTIARCH)
TARGET_FARCH=$(exec_container dpkg-architecture -f -a$TARGET_ARCH -qDEB_HOST_MULTIARCH)
if [ "$(exec_container dpkg-architecture -f -a$TARGET_ARCH -qDEB_BUILD_ARCH)" != "$TARGET_ARCH" ]; then
DEB_BUILD_PROFILES="cross nocheck nodoc noudeb"
EXTRA_DEB_BUILD_OPTIONS="nocheck nodoc noudeb"
else
DEB_BUILD_PROFILES="noudeb"
EXTRA_DEB_BUILD_OPTIONS="noudeb"
fi
}

create_container () {
lxc remote --protocol=simplestreams --public=true --accept-certificate=true add ubports-sdk https://sdk-images.ubports.com || true
lxc init $LXD_IMAGE $LXD_CONTAINER $EPHEMERAL_FLAG
Expand Down Expand Up @@ -386,6 +428,7 @@ create_container () {
exec_container_root adduser $USERNAME sudo
# set empty password for the user
exec_container_root passwd --delete $USERNAME
detect_farch_and_build_params_in_container
exec_container_root "printf 'export PKG_CONFIG_PATH=/usr/lib/$TARGET_FARCH/pkgconfig\n\
export CROSS_COMPILE=$TARGET_FARCH-\n\
export CC=$TARGET_FARCH-gcc\n\
Expand All @@ -401,6 +444,8 @@ ensure_container () {
echo -e "${POSITIVE_COLOR}LXD container $LXD_CONTAINER already exists.${NC}"
config_container_dir_mount
start_container
check_for_container_network
detect_farch_and_build_params_in_container
else
echo -e "${POSITIVE_COLOR}Creating LXD container $LXD_CONTAINER using $LXD_IMAGE.${NC}"
create_container
Expand Down Expand Up @@ -458,7 +503,8 @@ get_source_package () {
exit 1
fi

PACKAGE_VERSION=`dpkg-parsechangelog --show-field Version -l $PACKAGE*/debian/changelog`
PACKAGE_VERSION=$(exec_container dpkg-parsechangelog --show-field Version -l $PACKAGE*/debian/changelog)

exec_container "mv $PACKAGE*.orig.tar.* $PACKAGE*diff.* $PACKAGE*debian.tar* $PACKAGE*.dsc $USERDIR/" || true
mv $PACKAGE-*/* .
mv $PACKAGE-*/.[!.]* . || true
Expand Down Expand Up @@ -550,6 +596,7 @@ install_dependencies () {
cp debian/control "${TMP_DIR}/"
workaround_multi_arch_deps ${TMP_DIR}/control
exec_container_root apt-get update

# TODO: add build profiles to mk-build-deps once wishlist bug
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=894732 is fixed and
# propagated to Ubuntu version we will use in the future.
Expand Down Expand Up @@ -671,8 +718,22 @@ check_for_container_network() {
sleep 1
done
if [ $NETWORK_UP -ne 1 ] ; then
echo -e "${ERROR_COLOR}Container is not connected to the Internet.${NC}"
exit 1
# On manjaro the 16.04 containers can't get ip4 address.
# This can be corrected by running 'dhclient' in container.
exec_container_root "dhclient"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But this means that in manjaro you have to wait at least 10 seconds, right? Or are there cases when dhclient is not needed?

Does it make sense to reduce both loops to 5 iterations each, so that Manjaro users won't have to wait that long? (and it would still remain up to 10 seconds for Ubuntu users)

for i in `seq 1 10`
do
if lxc query "/1.0/containers/${LXD_CONTAINER}/state" | jq -e '.network.eth0.addresses | any( .family == "inet" )' > /dev/null 2>&1 ; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this is the same command we have above, I suggest:

  1. renaming this function to ensure_container_network()
  2. create a small check_container_network() function containing the lxc query command

echo -e "${POSITIVE_COLOR}Container is connected to the Internet.${NC}"
NETWORK_UP=1
break
fi
sleep 1
done
if [ $NETWORK_UP -ne 1 ] ; then
echo -e "${ERROR_COLOR}Container is not connected to the Internet.${NC}"
exit 1
fi
fi

}
Expand Down Expand Up @@ -796,24 +857,63 @@ deploy_to_device () {
fi
}

detect_host_architecture() {
if which dpkg > /dev/null 2>&1 ; then
HOST_ARCH=`dpkg --print-architecture`
else
# To find out the host's debian architecture name, first find out debian multiarch tuple and use conversion table.
# Source: https://wiki.debian.org/Multiarch/Tuples

if [ -z $HOST_FARCH ] && which gcc > /dev/null 2>&1 ; then
HOST_FARCH=$(gcc -print-multiarch)

# On manjaro the 'gcc -print-multiarch' returns nothing.
# Use the 'gcc -dumpmachine' multiarch triplet result and strip the vendor part if the result contains it.
[ -z $HOST_FARCH ] && HOST_FARCH=$(gcc -dumpmachine | sed 's/^\([^-]\+\)-\([^-]\+\)-\([^-]\+\)-\([^-]\+\)$/\1-\3-\4/')
fi

declare -A MULTIARCH_TO_DEBIAN=( \
[x86_64-linux-gnu]=amd64 \
[arm-linux-gnu]=arm \
[aarch64-linux-gnu]=arm64 \
[aarch64-linux-gnu_ilp32]=arm64ilp32 \
[arm-linux-gnueabi]=armel \
[arm-linux-gnueabihf]=armhf \
[riscv64-linux-gnu]=riscv64 \
[x86_64-uefi]=uefi-amd6436 \
[aarch64-uefi]=uefi-arm6436 \
[arm-uefi]=uefi-armhf36 \
[i386-uefi]=uefi-i38636 \
[x86_64-linux-gnux32]=x32 \
)
HOST_ARCH=${MULTIARCH_TO_DEBIAN[$HOST_FARCH]}
fi
}

MISSING_PACKAGES=
if ! which dpkg > /dev/null ; then
MISSING_PACKAGES="dpkg"
fi
if ! which dpkg-parsechangelog > /dev/null ; then
MISSING_PACKAGES="dpkg-dev $MISSING_PACKAGES"
fi
if ! which adb > /dev/null ; then
MISSING_PACKAGES="android-tools-adb $MISSING_PACKAGES"
if ! which adb > /dev/null 2>&1 ; then
if which apt > /dev/null 2>&1 ; then
MISSING_PACKAGES="android-tools-adb $MISSING_PACKAGES"
elif which pacman > /dev/null 2>&1 ; then
MISSING_PACKAGES="android-tools $MISSING_PACKAGES"
fi
fi
if ! which jq > /dev/null; then
MISSING_PACKAGES="jq $MISSING_PACKAGES"
fi

if [ ! -z "$MISSING_PACKAGES" ] ; then
echo -e "${POSITIVE_COLOR}$PROGRAM_NAME depends on $MISSING_PACKAGES. Installing:${NC}"
echo "sudo apt install $MISSING_PACKAGES"
sudo apt install $MISSING_PACKAGES
if which apt > /dev/null 2>&1 ; then
echo "sudo apt install $MISSING_PACKAGES"
sudo apt install $MISSING_PACKAGES
elif which pacman > /dev/null 2>&1 ; then
echo "sudo pacman -Syu $MISSING_PACKAGES"
sudo pacman -Syu $MISSING_PACKAGES
else
echo -e "${ERROR_COLOR}No known package manager found to install missing packages.${NC}"
exit 1
fi
fi

if stat --file-system $HOME | grep ecrypt ; then
Expand All @@ -831,8 +931,21 @@ if ! which lxd > /dev/null ; then
echo
if [ "$REPLY" = y ]
then
echo "sudo apt-get install -y lxd lxd-client"
sudo apt-get install -y lxd lxd-client
if which apt-get > /dev/null 2>&1 ; then
echo "sudo apt-get install -y lxd lxd-client"
sudo apt-get install -y lxd lxd-client
elif which pacman > /dev/null 2>&1 ; then
echo "sudo pacman -Syu --noconfirm lxd"
sudo pacman -Syu lxd
echo "sudo systemctl start lxd"
sudo systemctl start lxd
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isn't this being done later anyway?

elif which snap > /dev/null 2>&1 ; then
echo "sudo snap install lxd"
sudo snap install lxd
else
echo -e "${ERROR_COLOR}No known package manager found to install lxd containers.${NC}"
exit 1
fi
setup_lxd
ensure_lxd_subuid
newgrp lxd
Expand All @@ -845,10 +958,16 @@ if ! which lxd > /dev/null ; then
fi
fi

check_lxd_accessible
ensure_lxd_subuid
check_lxd_accessible

[ -z $HOST_ARCH ] && detect_host_architecture
if [ -z $HOST_ARCH ] ; then
echo -e "${ERROR_COLOR}Coudln't find out debian architecture name of this device.${NC}"
echo -e "If you know it, set the HOST_ARCH variable before running crossbuilder."
exit 1
fi

HOST_ARCH=`dpkg --print-architecture`
TARGET_ARCH=armhf
TARGET_UBUNTU=16.04

Expand Down Expand Up @@ -958,8 +1077,19 @@ check_command_parameter_count () {

detect_package () {
if test -e debian/changelog ; then
PACKAGE=`dpkg-parsechangelog --show-field Source`
PACKAGE_VERSION=`dpkg-parsechangelog --show-field Version`
if which dpkg-parsechangelog > /dev/null 2>&1 ; then
PACKAGE=`dpkg-parsechangelog --show-field Source`
PACKAGE_VERSION=`dpkg-parsechangelog --show-field Version`
else
# Get package name and version parsing the debian/changelog file using grep.
local RES=($(grep -P '^[^ ]+ \([^)]+\) [^;]+; urgency=.*$' debian/changelog | head -n1 | sed 's/^\([^ ]\+\) (\([^)]\+\)).*/\1 \2/'))
PACKAGE=${RES[0]}
PACKAGE_VERSION=${RES[1]}
fi
if [ -z $PACKAGE ] || [ -z $PACKAGE_VERSION ] ; then
echo -e "${ERROR_COLOR}Coudln't find out package name and/or version from debian/changelog file.${NC}"
exit 1
fi
fi
}

Expand Down Expand Up @@ -1137,6 +1267,7 @@ else
enter_or_detect_package $1
variables
start_container_if_exists
detect_farch_and_build_params_in_container
clean
;;
deploy)
Expand Down