From 4338886211c537a426e36a78c0d7fc4c23e670e7 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Sat, 29 Sep 2018 11:33:34 +0800 Subject: [PATCH] obs-package: rename kernel to linux-container We are using linux-container repo in the subproject. Signed-off-by: Peng Tao --- obs-packaging/{kernel => linux-container}/Makefile.dist.install | 0 obs-packaging/{kernel => linux-container}/_service-template | 0 obs-packaging/{kernel => linux-container}/debian.compat | 0 .../{kernel => linux-container}/debian.control-template | 0 obs-packaging/{kernel => linux-container}/debian.copyright | 0 obs-packaging/{kernel => linux-container}/debian.dirs | 1 - obs-packaging/{kernel => linux-container}/debian.rules | 0 .../kata-linux-container.dsc-template | 0 .../kata-linux-container.spec-template | 2 +- obs-packaging/{kernel => linux-container}/update.sh | 0 obs-packaging/scripts/obs-pkgs.sh | 2 +- 11 files changed, 2 insertions(+), 3 deletions(-) rename obs-packaging/{kernel => linux-container}/Makefile.dist.install (100%) rename obs-packaging/{kernel => linux-container}/_service-template (100%) rename obs-packaging/{kernel => linux-container}/debian.compat (100%) rename obs-packaging/{kernel => linux-container}/debian.control-template (100%) rename obs-packaging/{kernel => linux-container}/debian.copyright (100%) rename obs-packaging/{kernel => linux-container}/debian.dirs (96%) rename obs-packaging/{kernel => linux-container}/debian.rules (100%) rename obs-packaging/{kernel => linux-container}/kata-linux-container.dsc-template (100%) rename obs-packaging/{kernel => linux-container}/kata-linux-container.spec-template (98%) rename obs-packaging/{kernel => linux-container}/update.sh (100%) diff --git a/obs-packaging/kernel/Makefile.dist.install b/obs-packaging/linux-container/Makefile.dist.install similarity index 100% rename from obs-packaging/kernel/Makefile.dist.install rename to obs-packaging/linux-container/Makefile.dist.install diff --git a/obs-packaging/kernel/_service-template b/obs-packaging/linux-container/_service-template similarity index 100% rename from obs-packaging/kernel/_service-template rename to obs-packaging/linux-container/_service-template diff --git a/obs-packaging/kernel/debian.compat b/obs-packaging/linux-container/debian.compat similarity index 100% rename from obs-packaging/kernel/debian.compat rename to obs-packaging/linux-container/debian.compat diff --git a/obs-packaging/kernel/debian.control-template b/obs-packaging/linux-container/debian.control-template similarity index 100% rename from obs-packaging/kernel/debian.control-template rename to obs-packaging/linux-container/debian.control-template diff --git a/obs-packaging/kernel/debian.copyright b/obs-packaging/linux-container/debian.copyright similarity index 100% rename from obs-packaging/kernel/debian.copyright rename to obs-packaging/linux-container/debian.copyright diff --git a/obs-packaging/kernel/debian.dirs b/obs-packaging/linux-container/debian.dirs similarity index 96% rename from obs-packaging/kernel/debian.dirs rename to obs-packaging/linux-container/debian.dirs index f057e05413..028fc735c9 100644 --- a/obs-packaging/kernel/debian.dirs +++ b/obs-packaging/linux-container/debian.dirs @@ -1,2 +1 @@ usr/share/Kata-containers - diff --git a/obs-packaging/kernel/debian.rules b/obs-packaging/linux-container/debian.rules similarity index 100% rename from obs-packaging/kernel/debian.rules rename to obs-packaging/linux-container/debian.rules diff --git a/obs-packaging/kernel/kata-linux-container.dsc-template b/obs-packaging/linux-container/kata-linux-container.dsc-template similarity index 100% rename from obs-packaging/kernel/kata-linux-container.dsc-template rename to obs-packaging/linux-container/kata-linux-container.dsc-template diff --git a/obs-packaging/kernel/kata-linux-container.spec-template b/obs-packaging/linux-container/kata-linux-container.spec-template similarity index 98% rename from obs-packaging/kernel/kata-linux-container.spec-template rename to obs-packaging/linux-container/kata-linux-container.spec-template index d7ea338844..713eb6ef7f 100644 --- a/obs-packaging/kernel/kata-linux-container.spec-template +++ b/obs-packaging/linux-container/kata-linux-container.spec-template @@ -79,7 +79,7 @@ BuildKernel() { %if 0%{?fedora} #Fedora uses gcc 8, build is failing due to warnings. - export CFLAGS="-Wno-error=restrict" + export CFLAGS="-Wno-error=restrict" export EXTRA_CFLAGS="-Wno-format-truncation -Wno-cast-function-type -Wno-error=restrict -Wno-error" %endif diff --git a/obs-packaging/kernel/update.sh b/obs-packaging/linux-container/update.sh similarity index 100% rename from obs-packaging/kernel/update.sh rename to obs-packaging/linux-container/update.sh diff --git a/obs-packaging/scripts/obs-pkgs.sh b/obs-packaging/scripts/obs-pkgs.sh index e5c634b0b9..f3b3b80c8a 100755 --- a/obs-packaging/scripts/obs-pkgs.sh +++ b/obs-packaging/scripts/obs-pkgs.sh @@ -9,7 +9,7 @@ OBS_PKGS_PROJECTS=( qemu-lite qemu-vanilla - kernel + linux-container kata-containers-image proxy shim