diff --git a/build b/build index 725b66a..f7d81eb 100755 --- a/build +++ b/build @@ -24,14 +24,4 @@ git clone https://github.com/lukc/pkgxx && \ cd .. && \ rm -rf pkgxx || exit 1 -# Configure pkgxx -echo "> Configure pkgxx" -mkdir -p /opt/pkgxx/dev && \ - sed -i -e 's#prefix = .*$#prefix = "/opt/pkgxx/dev"#' \ - -e 's#distribution = .*$#distribution = "Alpine"#' \ - -e 's#package-manager = .*$#package-manager = "apk"#' \ - -e 's#repository-manager = .*$#repository-manager = "apk"#' \ - -e '/distribution-codename/d' \ - -e 's#provider = .*$#provider = "Dev Team"#' /etc/pkgxx.conf - # FIXME: DL yunoconfig diff --git a/install-and-chroot.sh b/install-and-chroot.sh index 12abe3b..7e73f74 100755 --- a/install-and-chroot.sh +++ b/install-and-chroot.sh @@ -36,6 +36,10 @@ fi # Set rc_sys="prefix" to not disturb systemd on current system sudo sed -e 's/#rc_sys=""/rc_sys="prefix"/g' -i "$DIR/etc/rc.conf" +# Insert pkg++ configuration in chroot +sudo mkdir -p /opt/pkgxx/dev && \ + sudo cp "pkgxx.conf.example" "$DIR/etc/pkgxx.conf" || exit 1 + # Launch chroot sh $DIR/enter-chroot ./build diff --git a/pkgxx.conf.example b/pkgxx.conf.example new file mode 100644 index 0000000..9eb7416 --- /dev/null +++ b/pkgxx.conf.example @@ -0,0 +1,7 @@ +distribution = "Alpine" +package-manager = "apk" +repository-manager = "apk" + +builder = "Contributor Dev Team" + +packages-directory = "/opt/pkgxx/test"