GitHub-Mirror/build
2
0
Fork 0
mirror of https://github.com/Fishwaldo/build.git synced 2025-03-15 11:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better conditions for newer distribution (#2768)

Browse source
This commit is contained in:
Przemysław Sztoch 2021-04-14 00:44:29 +02:00 • committed by GitHub
parent dc2076e99f
commit 3f4c73727a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/chroot-buildpackages.sh
View file

@ -52,7 +52,7 @@ create_chroot()
else
local mirror_addr="http://${apt_mirror[${release}]}"
fi
debootstrap --variant=buildd --components="${components[${release}]}" --arch="${arch}" --foreign --include="${includes}" "${release}" "${target_dir}" "${mirror_addr}"
debootstrap --variant=buildd --components="${components[${release}]}" --arch="${arch}" $DEBOOTSTRAP_OPTION --foreign --include="${includes}" "${release}" "${target_dir}" "${mirror_addr}"
[[ $? -ne 0 || ! -f "${target_dir}"/debootstrap/debootstrap ]] && exit_with_error "Create chroot first stage failed"
cp /usr/bin/${qemu_binary[$arch]} "${target_dir}"/usr/bin/
[[ ! -f "${target_dir}"/usr/share/keyrings/debian-archive-keyring.gpg ]] && \
@ -81,7 +81,7 @@ create_chroot()
mkdir -p "${target_dir}"/var/lock
fi
chroot "${target_dir}" /bin/bash -c "/usr/sbin/update-ccache-symlinks"
[[ $release == focal || $release == groovy || $release == hirsute || $release == sid ]] && chroot "${target_dir}" /bin/bash -c "ln -s /usr/bin/python3 /usr/bin/python"
[[ $release == bullseye || $release == focal || $release == groovy || $release == hirsute || $release == sid ]] && chroot "${target_dir}" /bin/bash -c "ln -s /usr/bin/python3 /usr/bin/python"
touch "${target_dir}"/root/.debootstrap-complete
display_alert "Debootstrap complete" "${release}/${arch}" "info"
} #############################################################################

4
packages/extras-buildpkgs/04-libvdpau.conf
View file

@ -12,10 +12,10 @@ local package_component="${release}-desktop"
package_checkbuild()
{
# we don't support running kernels < 3.13 on Stretch or Bionic
[[ $release != stretch && $release != bionic && $release != disco && $release != buster ]]
[[ $release == jessie || $release == xenial ]]
}
package_checkinstall()
{
[[ ( $LINUXFAMILY == sun*i || $LINUXFAMILY == pine64 ) && $BRANCH == default && $RELEASE != stretch && $RELEASE != bionic && $BUILD_DESKTOP == yes ]]
[[ ( $LINUXFAMILY == sun*i || $LINUXFAMILY == pine64 ) && $BRANCH == default && ( $RELEASE == jessie && $RELEASE == xenial ) && $BUILD_DESKTOP == yes ]]
}

4
packages/extras-buildpkgs/05-libump.conf
View file

@ -12,10 +12,10 @@ local package_component="${release}-desktop"
package_checkbuild()
{
# we don't support running kernels < 3.13 on Stretch or Bionic
[[ $arch == armhf && $release != stretch && $release != bionic && $release != buster && $release != disco ]]
[[ $arch == armhf && ( $release == jessie || $release == xenial ) ]]
}
package_checkinstall()
{
[[ $LINUXFAMILY == sun*i && $BRANCH == default && $RELEASE != stretch && $RELEASE != bionic && $BUILD_DESKTOP == yes ]]
[[ $LINUXFAMILY == sun*i && $BRANCH == default && ( $release == jessie || $release == xenial ) && $BUILD_DESKTOP == yes ]]
}

4
packages/extras-buildpkgs/06-libcedrus.conf
View file

@ -12,10 +12,10 @@ local package_component="${release}-desktop"
package_checkbuild()
{
# we don't support running kernels < 3.13 on Stretch or Bionic
[[ $release != stretch && $release != bionic && $release != buster && $release != disco ]]
[[ $release == jessie || $release == xenial ]]
}
package_checkinstall()
{
[[ ( $LINUXFAMILY == sun*i || $LINUXFAMILY == pine64 ) && $RELEASE != stretch && $RELEASE != bionic && $BRANCH == default && $BUILD_DESKTOP == yes ]]
[[ ( $LINUXFAMILY == sun*i || $LINUXFAMILY == pine64 ) && $BRANCH == default && ( $RELEASE == jessie && $RELEASE == xenial ) && $BUILD_DESKTOP == yes ]]
}

3
packages/extras-buildpkgs/06-xf86-video-fbturbo.conf
View file

@ -12,8 +12,7 @@ local package_component="${release}-desktop"
package_checkbuild()
{
# we don't support running kernels < 3.13 on Stretch or Bionic
[[ $release != stretch && $release != bionic ]]
[[ $release != stretch && $release != bionic && $release != buster && $release != disco ]]
[[ $release == jessie || $release == xenial ]]
}
package_checkinstall()

2
packages/extras-buildpkgs/90-fswebcam-gc2035.conf.disabled
View file

@ -10,7 +10,7 @@ local package_component="${release}-desktop"
package_checkbuild()
{
# we don't support running kernels < 3.13 on Stretch or Bionic
[[ $arch == armhf && $release != stretch && $release != bionic ]]
[[ $arch == armhf && ( $release == jessie || $release == xenial ) ]]
}
package_checkinstall()

2
packages/extras-buildpkgs/90-guvcview.conf.disabled
View file

@ -11,7 +11,7 @@ local package_component="${release}-desktop"
package_checkbuild()
{
# we don't support running kernels < 3.13 on Stretch or Bionic
[[ $arch == armhf && $release != stretch && $release != bionic ]]
[[ $arch == armhf && ( $release == jessie || $release == xenial ) ]]
}
package_checkinstall()

4
packages/extras-buildpkgs/90-htop.conf
View file

@ -8,9 +8,9 @@ local package_builddeps="debhelper dpkg-dev libhwloc-dev libncurses5-dev libncur
local package_install_target="htop"
local package_component="${release}-utils"
if [[ $release == focal || $release == groovy ]]; then
if [[ $release == focal || $release == groovy || $release == bullseye ]]; then
package_builddeps+=" python3-minimal:native"
else
else
package_builddeps+=" python-minimal:native"
fi

2
packages/extras-buildpkgs/90-libglshim.conf
View file

@ -10,7 +10,7 @@ local package_component="${release}-desktop"
package_checkbuild()
{
# we don't support running kernels < 3.13 on Stretch or Bionic
[[ $arch == armhf && $release != stretch && $release != bionic && $release != buster && $release != disco ]]
[[ $arch == armhf && ( $release == jessie || $release == xenial ) ]]
}
package_checkinstall()

2
packages/extras-buildpkgs/90-libmali-sunxi-r3p0.conf
View file

@ -12,7 +12,7 @@ local package_component="${release}-desktop"
package_checkbuild()
{
# we don't support running kernels < 3.13 on Stretch or Bionic
[[ $arch == armhf && $release != stretch && $release != bionic && $release != buster && $release != disco ]]
[[ $arch == armhf && ( $release == jessie || $release == xenial ) ]]
}
package_checkinstall()

2
packages/extras-buildpkgs/90-libmali-sunxi-r3p0.conf.old
View file

@ -12,7 +12,7 @@ local package_component="${release}-desktop"
package_checkbuild()
{
# we don't support running kernels < 3.13 on Stretch
[[ $arch == armhf && $release != stretch ]]
[[ $arch == armhf && ( $release == jessie || $release == xenial ) ]]
}
package_checkinstall()

2
packages/extras-buildpkgs/90-libvdpau-sunxi.conf
View file

@ -13,7 +13,7 @@ local package_component="${release}-desktop"
package_checkbuild()
{
# we don't support running kernels < 3.13 on Stretch or Bionic
[[ $release != stretch && $release != bionic && $release != buster && $release != disco ]]
[[ $release == jessie || $release == xenial ]]
}
package_checkinstall()

2
packages/extras-buildpkgs/90-sunxi-tools.conf
View file

@ -3,7 +3,7 @@ local package_name="sunxi-tools"
local package_repo="https://github.com/linux-sunxi/sunxi-tools.git"
local package_ref="branch:master"
local package_upstream_version="1.4.2-2"
local package_builddeps="libusb-1.0-0-dev ruby binutils-arm-none-eabi pkg-config u-boot-tools zlib1g-dev"
local package_builddeps="libusb-1.0-0-dev ruby binutils-arm-none-eabi pkg-config u-boot-tools zlib1g-dev libfdt-dev"
local package_install_target="sunxi-tools"
local package_component="${release}-utils"