diff options
| -rw-r--r-- | app-admin/vasile/Manifest | 2 | ||||
| -rw-r--r-- | app-admin/vasile/files/master-branch.patch | 134 | ||||
| -rw-r--r-- | app-admin/vasile/vasile-1.1806.ebuild (renamed from app-admin/vasile/vasile-1.1803-r9.ebuild) | 6 |
3 files changed, 4 insertions, 138 deletions
diff --git a/app-admin/vasile/Manifest b/app-admin/vasile/Manifest index 12c58bdf..3e334295 100644 --- a/app-admin/vasile/Manifest +++ b/app-admin/vasile/Manifest @@ -1 +1 @@ -DIST vasile-1.1803.tar.gz 13330 BLAKE2B eb450e5c53002b248c89e52a635a7c04a392bb440efa66fbcd26e0f2504b1ca05664ae2226cf72eb73c52fda17c31851f630719bb84dd32816007462f7b2c0ab SHA512 bb890c5dcd775464e0f0227f177d0582d301db6c49f8ac0eb603438f8075cee3c662d0c9f21ca1e83ed79bce8bdf0ee6efbcbe0bec6c42c55766f7bdb500736a +DIST vasile-1.1806.tar.gz 13599 BLAKE2B af29f7c79b6a3f2f12247ec76832945f6b3248549d8a50331a6283fe19810b68ceb8aef2e8c3527d6d8ec25ee86360b0bbb87cb74f40616f25b81f7a2161eeea SHA512 9f9ad8ad63349f576a9a22c13fbf0af2ca6a414d43a48a1d8a45c82df5c8bc0f6e620d9cdb7bbfadd7f3f12de16b60aa123dfbf64bce71a476b128b595ec99c0 diff --git a/app-admin/vasile/files/master-branch.patch b/app-admin/vasile/files/master-branch.patch deleted file mode 100644 index da7942d8..00000000 --- a/app-admin/vasile/files/master-branch.patch +++ /dev/null @@ -1,134 +0,0 @@ -diff --git a/src/backend/c_jail.sh b/src/backend/c_jail.sh -index acdf0db..0a486b4 100644 ---- a/src/backend/c_jail.sh -+++ b/src/backend/c_jail.sh -@@ -5,6 +5,7 @@ export local jailsrcmodecmd="vasile --srcmode" - export local jaildkmscmd="vasile --dkms" - export local jailmandbcmd="mandb --create" - export local jailportagecmd="emerge -kav "$jailtarget"" -+export local jailupgradecmd="emerge -NuDKv --backtrack=100 --with-bdeps=y @world --exclude linux-image-lts --exclude linux-headers-lts --exclude linux-image-redcore --exclude linux-sources-redcore" - export local jaildracutcmd="dracut -N -a dmsquash-live -a pollcdrom --force --kver="$kernver" /boot/"$jailramfsname"" - export local jailmkchainloadercmd="grub2-mkimage -d /usr/lib64/grub/i386-pc -o core.img -O i386-pc biosdisk part_msdos fat -p /boot/grub" - export local jailmkx64eficmd="grub2-mkimage -d /usr/lib64/grub/x86_64-efi -o bootx64.efi -O x86_64-efi ext2 fat udf btrfs ntfs reiserfs xfs hfsplus lvm ata part_msdos part_gpt part_apple bsd search_fs_uuid normal chain iso9660 configfile help loadenv reboot cat search memdisk tar boot linux chain -p /boot/grub" -diff --git a/src/backend/f_makeiso.sh b/src/backend/f_makeiso.sh -index fb85d8a..936a780 100644 ---- a/src/backend/f_makeiso.sh -+++ b/src/backend/f_makeiso.sh -@@ -39,7 +39,7 @@ jailisomkchload () { - - jailisoenserv () { - chroot "$jailsynctarget" su - "$jailuser" -c "rc-update add redcorelive boot" -- for service in acpid alsasound avahi-daemon bluetooth cronie cupsd ModemManager NetworkManager ntpd openrc-settingsd samba syslog-ng ufw virtualbox-guest-additions xdm ; do -+ for service in acpid alsasound avahi-daemon bluetooth cronie cupsd ModemManager NetworkManager ntpd openrc-settingsd samba syslog-ng ufw xdm ; do - chroot "$jailsynctarget" su - "$jailuser" -c "rc-update add "$service" default" - done - } -diff --git a/src/backend/f_makepkg.sh b/src/backend/f_makepkg.sh -index 1c16d45..0c4d0b8 100644 ---- a/src/backend/f_makepkg.sh -+++ b/src/backend/f_makepkg.sh -@@ -48,6 +48,10 @@ jailpkgsrcmode () { - chroot "$overlaypath" su - "$jailuser" -c "$jailsrcmodecmd" - } - -+jailpkgupgrade () { -+ chroot "$overlaypath" su - "$jailuser" -c "$jailupgradecmd" -+} -+ - jailpkgbuild () { - chroot "$overlaypath" su - "$jailuser" -c "$jailportagecmd" - } -@@ -62,6 +66,7 @@ makepkg () { - checkjailsum - jailpkgprep - jailpkgsrcmode -+ jailpkgupgrade - jailpkgbuild - jailpkgstart - jailpkgdmnt -diff --git a/src/backend/f_modeswitch.sh b/src/backend/f_modeswitch.sh -index 4f6c271..90d6266 100644 ---- a/src/backend/f_modeswitch.sh -+++ b/src/backend/f_modeswitch.sh -@@ -15,7 +15,7 @@ rmaddonporttree () { - } - - rmportcfgtree () { -- einfo "I am removing ebuild tree configuration" -+ einfo "I am removing portage configuration" - rm ""$jailportcfgtarget"/make.conf" > /dev/null 2>&1 - rm ""$jailportcfgtarget"/make.profile" > /dev/null 2>&1 - rm "$jailportcfgtarget" > /dev/null 2>&1 -@@ -81,7 +81,7 @@ dladdonportmintree () { - - dlportcfgtree () { - pushd /opt > /dev/null 2>&1 -- einfo "I am injecting ebuild tree configuration" -+ einfo "I am injecting portage configuration" - git clone https://gitlab.com/redcore/redcore-build.git - popd > /dev/null 2>&1 - } -@@ -98,44 +98,54 @@ injectportfulltree () { - dlportcfgtree - } - --setbinmodecfg () { -- ln -sf "$jailportcfgsource" "$jailportcfgtarget" -- ln -sf "$jailportcfgtarget"/make.conf.amd64-binmode "$jailportcfgtarget"/make.conf -+setmakeopts () { -+ einfo "I am setting portage to use $(getconf _NPROCESSORS_ONLN) jobs to compile packages" -+ # default MAKEOPTS value is -j64, but that's overkill for lower spec machines -+ # this will adjust MAKEOPTS to a value detected by $(getconf _NPROCESSORS_ONLN) -+ sed -i "s/\-j64/\-j$(getconf _NPROCESSORS_ONLN)/g" "$jailportcfgtarget"/global.conf/makeopts.conf # global makeopts (exclude kernel) -+ sed -i "s/\-j64/\-j$(getconf _NPROCESSORS_ONLN)/g" "$jailportcfgtarget"/env/makenoise.conf # kernel makeopts -+} -+ -+setprofile () { - eselect profile set default/linux/amd64/17.0/hardened - env-update - . /etc/profile - } - -+setbinmodecfg () { -+ ln -sf "$jailportcfgsource" "$jailportcfgtarget" -+ ln -sf "$jailportcfgtarget"/make.conf.amd64-binmode "$jailportcfgtarget"/make.conf -+} -+ - binmode () { - resetmode - injectportmintree - setbinmodecfg -+ setprofile - } - - setmixedmodecfg () { - ln -sf "$jailportcfgsource" "$jailportcfgtarget" - ln -sf "$jailportcfgtarget"/make.conf.amd64-mixedmode "$jailportcfgtarget"/make.conf -- eselect profile set default/linux/amd64/17.0/hardened -- env-update -- . /etc/profile - } - - mixedmode () { - resetmode - injectportfulltree - setmixedmodecfg -+ setmakeopts -+ setprofile - } - - setsrcmodecfg () { - ln -sf "$jailportcfgsource" "$jailportcfgtarget" - ln -sf "$jailportcfgtarget"/make.conf.amd64-srcmode "$jailportcfgtarget"/make.conf -- eselect profile set default/linux/amd64/17.0/hardened -- env-update -- . /etc/profile - } - - srcmode() { - resetmode - injectportfulltree - setsrcmodecfg -+ setmakeopts -+ setprofile - } diff --git a/app-admin/vasile/vasile-1.1803-r9.ebuild b/app-admin/vasile/vasile-1.1806.ebuild index 8895dfc1..de8d14cf 100644 --- a/app-admin/vasile/vasile-1.1803-r9.ebuild +++ b/app-admin/vasile/vasile-1.1806.ebuild @@ -1,4 +1,4 @@ -# Copyright 2016-2017 Redcore Linux Project +# Copyright 2016-2018 Redcore Linux Project # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -7,7 +7,7 @@ inherit eutils DESCRIPTION="Versatile Advanced Script for ISO and Latest Enchantments" HOMEPAGE="https://redcorelinux.org" -SRC_URI="https://github.com/redcorelinux/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://gitlab.com/redcore/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64" @@ -22,7 +22,7 @@ RDEPEND="${DEPEND} sys-fs/mtools sys-fs/squashfs-tools" -PATCHES=( "${FILESDIR}"/master-branch.patch ) +S=${WORKDIR}/${PN}-v${PV} src_install() { default |