summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTyler Baker <tyler.baker@linaro.org>2017-04-04 08:40:50 -0700
committerTyler Baker <tyler.baker@linaro.org>2017-04-04 08:40:50 -0700
commitab6fb209a0fb1001bec7fc421615e70081ad978a (patch)
treecc7b4e917d9f534ec5b144a5adfed444f6ebbb92
parent03544166c8be8f0565b59e02f3c80c709680f24e (diff)
HACK: Remove hacky patch
Signed-off-by: Tyler Baker <tyler.baker@linaro.org>
-rw-r--r--Dockerfile4
-rw-r--r--hack.patch26
2 files changed, 0 insertions, 30 deletions
diff --git a/Dockerfile b/Dockerfile
index 528c09a..02e14f7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,9 +36,6 @@ RUN echo 'lava-server lava-server/instance-name string lava-docker-instance' |
&& /stop.sh \
&& rm -rf /var/lib/apt/lists/*
-# Add patches
-COPY hack.patch /root/
-
# Create a admin user (Insecure note, this creates a default user, username: admin/admin)
RUN /start.sh \
&& echo "from django.contrib.auth.models import User; User.objects.create_superuser('admin', 'admin@localhost.com', 'admin')" | lava-server manage shell \
@@ -52,7 +49,6 @@ RUN /start.sh \
&& git clone -b master https://git.linaro.org/lava/lava-server.git /root/lava-server \
&& cd /root/lava-server \
&& git checkout 2017.2 \
- && git am /root/hack.patch \
&& git fetch https://review.linaro.org/lava/lava-server refs/changes/28/18328/1 && git cherry-pick FETCH_HEAD \
&& echo "cd \${DIR} && dpkg -i *.deb" >> /root/lava-server/share/debian-dev-build.sh \
&& cd /root/lava-dispatcher && /root/lava-server/share/debian-dev-build.sh -p lava-dispatcher \
diff --git a/hack.patch b/hack.patch
deleted file mode 100644
index 4839f9e..0000000
--- a/hack.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ae6dce30647ef602c750a3159ceac7bb801b001d Mon Sep 17 00:00:00 2001
-From: Tyler Baker <tyler.baker@linaro.org>
-Date: Fri, 31 Mar 2017 16:50:52 -0700
-Subject: [PATCH] HACK: switch to using unbroken pkg repo
-
-Signed-off-by: Tyler Baker <tyler.baker@linaro.org>
----
- share/debian-dev-build.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/share/debian-dev-build.sh b/share/debian-dev-build.sh
-index fca723a..24ae14c 100755
---- a/share/debian-dev-build.sh
-+++ b/share/debian-dev-build.sh
-@@ -65,7 +65,7 @@ else
- mv -v ./dist/${NAME}*.tar.gz ${DIR}/${NAME}_${VERSION}.orig.tar.gz
- fi
- cd ${DIR}
--git clone https://github.com/Linaro/pkg-${NAME}.git
-+git clone https://github.com/EmbeddedAndroid/pkg-${NAME}.git
- tar -xzf ${NAME}_${VERSION}.orig.tar.gz
- if [ ! -d ${DIR}/${NAME}-${VERSION} ]; then
- mv -v ${DIR}/${NAME}-* ${DIR}/${NAME}-${VERSION}
---
-2.9.3
-