Go back to cp-based control archive but right

4 years ago · e87a10235b
parent c478a43fd5
commit e87a10235b
12 changed files with 18 additions and 18 deletions
--- a/deployment/Dockerfile.debian.amd64
+++ b/deployment/Dockerfile.debian.amd64
@ -12,7 +12,7 @@ ENV IS_DOCKER=YES

 # Prepare Debian build environment
 RUN apt-get update \
- && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv libc6-dev libcurl4-openssl-dev libfontconfig1-dev libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0 git
+ && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv libc6-dev libcurl4-openssl-dev libfontconfig1-dev libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0

 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
--- a/deployment/Dockerfile.debian.arm64
+++ b/deployment/Dockerfile.debian.arm64
@ -12,7 +12,7 @@ ENV IS_DOCKER=YES

 # Prepare Debian build environment
 RUN apt-get update \
- && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv git
+ && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv

 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
--- a/deployment/Dockerfile.debian.armhf
+++ b/deployment/Dockerfile.debian.armhf
@ -12,7 +12,7 @@ ENV IS_DOCKER=YES

 # Prepare Debian build environment
 RUN apt-get update \
- && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv git
+ && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv

 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
--- a/deployment/Dockerfile.ubuntu.amd64
+++ b/deployment/Dockerfile.ubuntu.amd64
@ -12,7 +12,7 @@ ENV IS_DOCKER=YES

 # Prepare Debian build environment
 RUN apt-get update \
- && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv libc6-dev libcurl4-openssl-dev libfontconfig1-dev libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0 git
+ && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv libc6-dev libcurl4-openssl-dev libfontconfig1-dev libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0

 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
--- a/deployment/Dockerfile.ubuntu.arm64
+++ b/deployment/Dockerfile.ubuntu.arm64
@ -12,7 +12,7 @@ ENV IS_DOCKER=YES

 # Prepare Debian build environment
 RUN apt-get update \
- && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv git
+ && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv

 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
--- a/deployment/Dockerfile.ubuntu.armhf
+++ b/deployment/Dockerfile.ubuntu.armhf
@ -12,7 +12,7 @@ ENV IS_DOCKER=YES

 # Prepare Debian build environment
 RUN apt-get update \
- && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv git
+ && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv

 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
--- a/deployment/build.debian.amd64
+++ b/deployment/build.debian.amd64
@ -10,7 +10,7 @@ pushd ${SOURCE_DIR}

 if [[ ${IS_DOCKER} == YES ]]; then
    # Remove build-dep for dotnet-sdk-3.1, since it's installed manually
-    cp debian/control debian/control.orig
+    cp -a debian/control /tmp/control.orig
    sed -i '/dotnet-sdk-3.1,/d' debian/control
 fi

@ -21,7 +21,7 @@ mkdir -p ${ARTIFACT_DIR}/
 mv ../jellyfin[-_]* ${ARTIFACT_DIR}/

 if [[ ${IS_DOCKER} == YES ]]; then
-    git checkout debian/control
+    cp -a /tmp/control.orig debian/control
    chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
 fi

--- a/deployment/build.debian.arm64
+++ b/deployment/build.debian.arm64
@ -10,7 +10,7 @@ pushd ${SOURCE_DIR}

 if [[ ${IS_DOCKER} == YES ]]; then
    # Remove build-dep for dotnet-sdk-3.1, since it's installed manually
-    cp debian/control debian/control.orig
+    cp -a debian/control /tmp/control.orig
    sed -i '/dotnet-sdk-3.1,/d' debian/control
 fi

@ -22,7 +22,7 @@ mkdir -p ${ARTIFACT_DIR}/
 mv ../jellyfin[-_]* ${ARTIFACT_DIR}/

 if [[ ${IS_DOCKER} == YES ]]; then
-    git checkout debian/control
+    cp -a /tmp/control.orig debian/control
    chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
 fi

--- a/deployment/build.debian.armhf
+++ b/deployment/build.debian.armhf
@ -10,7 +10,7 @@ pushd ${SOURCE_DIR}

 if [[ ${IS_DOCKER} == YES ]]; then
    # Remove build-dep for dotnet-sdk-3.1, since it's installed manually
-    cp debian/control debian/control.orig
+    cp -a debian/control /tmp/control.orig
    sed -i '/dotnet-sdk-3.1,/d' debian/control
 fi

@ -22,7 +22,7 @@ mkdir -p ${ARTIFACT_DIR}/
 mv ../jellyfin[-_]* ${ARTIFACT_DIR}/

 if [[ ${IS_DOCKER} == YES ]]; then
-    git checkout debian/control
+    cp -a /tmp/control.orig debian/control
    chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
 fi

--- a/deployment/build.ubuntu.amd64
+++ b/deployment/build.ubuntu.amd64
@ -10,7 +10,7 @@ pushd ${SOURCE_DIR}

 if [[ ${IS_DOCKER} == YES ]]; then
    # Remove build-dep for dotnet-sdk-3.1, since it's installed manually
-    cp debian/control debian/control.orig
+    cp -a debian/control /tmp/control.orig
    sed -i '/dotnet-sdk-3.1,/d' debian/control
 fi

@ -21,7 +21,7 @@ mkdir -p ${ARTIFACT_DIR}/
 mv ../jellyfin[-_]* ${ARTIFACT_DIR}/

 if [[ ${IS_DOCKER} == YES ]]; then
-    git checkout debian/control
+    cp -a /tmp/control.orig debian/control
    chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
 fi

--- a/deployment/build.ubuntu.arm64
+++ b/deployment/build.ubuntu.arm64
@ -10,7 +10,7 @@ pushd ${SOURCE_DIR}

 if [[ ${IS_DOCKER} == YES ]]; then
    # Remove build-dep for dotnet-sdk-3.1, since it's installed manually
-    cp debian/control debian/control.orig
+    cp -a debian/control /tmp/control.orig
    sed -i '/dotnet-sdk-3.1,/d' debian/control
 fi

@ -22,7 +22,7 @@ mkdir -p ${ARTIFACT_DIR}/
 mv ../jellyfin[-_]* ${ARTIFACT_DIR}/

 if [[ ${IS_DOCKER} == YES ]]; then
-    git checkout debian/control
+    cp -a /tmp/control.orig debian/control
    chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
 fi

--- a/deployment/build.ubuntu.armhf
+++ b/deployment/build.ubuntu.armhf
@ -10,7 +10,7 @@ pushd ${SOURCE_DIR}

 if [[ ${IS_DOCKER} == YES ]]; then
    # Remove build-dep for dotnet-sdk-3.1, since it's installed manually
-    cp debian/control debian/control.orig
+    cp -a debian/control /tmp/control.orig
    sed -i '/dotnet-sdk-3.1,/d' debian/control
 fi

@ -22,7 +22,7 @@ mkdir -p ${ARTIFACT_DIR}/
 mv ../jellyfin[-_]* ${ARTIFACT_DIR}/

 if [[ ${IS_DOCKER} == YES ]]; then
-    git checkout debian/control
+    cp -a /tmp/control.orig debian/control
    chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
 fi