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

Jump to bottom

A hook for mounting an extra-patches directory into the jail #928

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

A hook for mounting an extra-patches directory into the jail #928

wants to merge 10 commits into from

Commits on Oct 15, 2021

  1. A hook for mounting an extra-patches directory into the jail 

    I've been using this for over two years. It was recently updated
based upon suggestions:

https://gist.github.com/dlangille/924507ce545de8fbbe78b50b752997ce

Background:https://dan.langille.org/2019/08/10/poudriere-hooks/
    @dlangille
    dlangille committed Oct 15, 2021
    Configuration menu
    Copy the full SHA
    f4b2972 View commit details
    Browse the repository at this point in the history

  2. Use mkdir -p which removes the need for the test 

    Change /usr/local/etc/poudriere.d/local-patches to ${POUDRIERED}/local-patches
    @dlangille
    dlangille committed Oct 15, 2021
    Configuration menu
    Copy the full SHA
    f83c52e View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2021

  1. Restore check if the directory exists before creating it. 

    This morning my cronjob was spewing errors:

mkdir: /usr/local/poudriere/data/.m/122amd64-default-primary/ref/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/122amd64-default-primary/01/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/122amd64-default-primary/04/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/122amd64-default-primary/03/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/122amd64-default-primary/02/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/122amd64-default-mysql57/ref/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/122amd64-default-mysql80/ref/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/122amd64-default-pg96/ref/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/122amd64-default-pg10/ref/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/122amd64-default-pg11/ref/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/122amd64-default-pg12/ref/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/122amd64-default-pg13/ref/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/122amd64-default-unifi/ref/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/122i386-default-primaryi386/ref/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/13amd64-default-primary/ref/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/13amd64-default-primary/03/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/13amd64-default-primary/04/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/13amd64-default-primary/01/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/13amd64-default-primary/02/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/13amd64-default-mysql57/ref/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/13amd64-default-mysql80/ref/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/13amd64-default-pg96/ref/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/13amd64-default-pg10/ref/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/13amd64-default-pg11/ref/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/13amd64-default-pg12/ref/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/13amd64-default-pg13/ref/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/13amd64-default-unifi/ref/local-patches: File exists
mkdir: /usr/local/poudriere/data/.m/13i386-default-primaryi386/ref/local-patches: File exists
    @dlangille
    dlangille committed Oct 16, 2021
    Configuration menu
    Copy the full SHA
    c5a5f0b View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2021

  1. Fix va_args error on non-amd64 

    Reported by:	Mark Millard
    @bdrewery @dlangille
    bdrewery authored and dlangille committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    e2f2653 View commit details
    Browse the repository at this point in the history

  2. enter_interactive: Don't pkg-update. 

    build_repo is currently blocked for dry run modes and building the repo
in a test situation does not seem prudent. For now just disable this as
it is very new.

Fixes 1ee1367
    @bdrewery @dlangille
    bdrewery authored and dlangille committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    a78fcf1 View commit details
    Browse the repository at this point in the history

  3. CCACHE_NON_ROOT: Fix access to /root 

    Reported by:	ler
    @bdrewery @dlangille
    bdrewery authored and dlangille committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    8d56885 View commit details
    Browse the repository at this point in the history

  4. Remove surounding if and add -p to the mkdir 

    Seems I did not include the -p when I removed the if during my testing.
    @dlangille
    dlangille committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    eedf4ea View commit details
    Browse the repository at this point in the history

  5. Revert "Fix va_args error on non-amd64" 

    This reverts commit e2f2653.
    @dlangille
    dlangille committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    9a9e7df View commit details
    Browse the repository at this point in the history

  6. Revert "enter_interactive: Don't pkg-update." 

    This reverts commit a78fcf1.
    @dlangille
    dlangille committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    7bd0393 View commit details
    Browse the repository at this point in the history

  7. Revert "CCACHE_NON_ROOT: Fix access to /root" 

    This reverts commit 8d56885.
    @dlangille
    dlangille committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    21a6e08 View commit details
    Browse the repository at this point in the history