xbps-builder: Add xbps-build and fetch default last changes
This commit is contained in:
parent
9e44047d61
commit
854f697c08
3 changed files with 20 additions and 6 deletions
|
@ -1,5 +1,4 @@
|
|||
FROM d.xr.to/base:glibc
|
||||
COPY files/fakedchroot.sh /_fakedchroot.sh
|
||||
COPY files/setup-fakedchroot.sh /
|
||||
RUN bash /setup-fakedchroot.sh && rm /setup-fakedchroot.sh
|
||||
COPY files/* /opt/dxrto/
|
||||
RUN chmod a+x /opt/dxrto/setup-fakedchroot /opt/dxrto/fakedchroot.sh /opt/dxrto/xbps-build && /opt/dxrto/setup-fakedchroot && ln -s /opt/dxrto/xbps-build /bin/xbps-build
|
||||
WORKDIR '/_workdir'
|
||||
|
|
|
@ -1,7 +1,11 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
set -e;
|
||||
|
||||
if [ "$1" == "--fix" ]; then
|
||||
sed -i 's:check_installed_pkg base-chroot-0.1_1:true:' common/xbps-src/shutils/common.sh;
|
||||
exit $?
|
||||
fi
|
||||
|
||||
readonly WORKDIR="/_workdir"
|
||||
# Install base utils required for downloading latest void packages and running xbps-src
|
||||
xbps-install -Sy xtools base-devel chroot-git chroot-util-linux tar wget coreutils
|
||||
|
@ -11,8 +15,7 @@ git clone --depth 1 'https://github.com/void-linux/void-packages.git' "${WORKDIR
|
|||
cd "${WORKDIR}";
|
||||
|
||||
# Copy fakedchroot chroot style into chroot-style dir and make it executable
|
||||
cp /_fakedchroot.sh "${WORKDIR}/common/chroot-style/fakedchroot.sh";
|
||||
chmod a+x "${WORKDIR}/common/chroot-style/fakedchroot.sh";
|
||||
ln -s /opt/dxrto/fakedchroot.sh "${WORKDIR}/common/chroot-style/fakedchroot.sh";
|
||||
|
||||
# If masterdir exists: remove it, because we will replace it with a symlink
|
||||
if [ -d "${WORKDIR}/masterdir" ]; then
|
12
xbps-builder/files/xbps-build
Normal file
12
xbps-builder/files/xbps-build
Normal file
|
@ -0,0 +1,12 @@
|
|||
#!/usr/bin/bash
|
||||
set -e
|
||||
|
||||
cd /_workdir;
|
||||
|
||||
echo "Updating srcpkgs";
|
||||
git checkout .;
|
||||
git pull --ff;
|
||||
echo "Fixing fakedchroot";
|
||||
/opt/dxrto/setup-fakedchroot --fix;
|
||||
echo "Running build";
|
||||
./xbps-src pkg "$@";
|
Loading…
Reference in a new issue