From e509a05b93f242be03ca9330ab349f2c25b4d4a2 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 12 2016 18:11:07 +0000 Subject: import atomic-devmode-0.3.3-3.el7 --- diff --git a/.atomic-devmode.metadata b/.atomic-devmode.metadata new file mode 100644 index 0000000..3f8b151 --- /dev/null +++ b/.atomic-devmode.metadata @@ -0,0 +1 @@ +68762f119f3195f4ef5ba6e3d0b81cc6903d5fb8 SOURCES/atomic-devmode.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..edd4752 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/atomic-devmode.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/0001-init-pull-cockpit-from-the-rhel7-registry.patch b/SOURCES/0001-init-pull-cockpit-from-the-rhel7-registry.patch new file mode 100644 index 0000000..26c85f9 --- /dev/null +++ b/SOURCES/0001-init-pull-cockpit-from-the-rhel7-registry.patch @@ -0,0 +1,25 @@ +From 82101b4e8eeef12c84cbea16ca0bfef75ecf3b52 Mon Sep 17 00:00:00 2001 +From: Jonathan Lebon +Date: Tue, 3 May 2016 11:09:12 -0400 +Subject: [PATCH] init: pull cockpit from the rhel7 registry + +--- + libexec/init | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libexec/init b/libexec/init +index 8e7b425..f8793e8 100755 +--- a/libexec/init ++++ b/libexec/init +@@ -140,7 +140,7 @@ bottom_pane() { + fi + + rc=0 +- atomic run cockpit/ws || rc=$? ++ atomic run registry.access.redhat.com/rhel7/cockpit-ws || rc=$? + echo $rc > /run/atomic-devmode-cockpit.rc + journalctl -f + } +-- +2.5.0 + diff --git a/SPECS/atomic-devmode.spec b/SPECS/atomic-devmode.spec new file mode 100644 index 0000000..eafccc3 --- /dev/null +++ b/SPECS/atomic-devmode.spec @@ -0,0 +1,70 @@ +Name: atomic-devmode +Version: 0.3.3 +Release: 3%{?dist} +Summary: Atomic Developer Mode + +License: LGPLv3+ +URL: http://github.com/projectatomic/atomic-devmode + +# From `make archive REF=v${VERSION}` +Source: atomic-devmode.tar.gz +Patch0001: 0001-init-pull-cockpit-from-the-rhel7-registry.patch + +BuildArch: noarch + +# We're solely compatible with grub2, so don't build on +# platforms that don't have it. +ExcludeArch: s390 s390x %{arm} + +BuildRequires: git + +Requires: cloud-init +Requires: atomic +Requires: tmux +Requires: grub2-tools + +# NB: rpmlint complains about this (explicit-lib-dependency) +# but we need it because the package provides the pwmake +# tool, which the scripts require. That tool should probably +# be broken out in a different package. +Requires: libpwquality + +%description +This package installs a Developer Mode boot option useful +for trying out an Atomic Host without having to set up a +cloud-init source. When booted, the system automatically +logs in and starts the Cockpit container. + +%prep +%autosetup -S git -n atomic-devmode + +%build +# Nothing to build + +%install +rm -rf "%{buildroot}" +make install DESTDIR="%{buildroot}" + +%files +%{_datarootdir}/atomic-devmode +%{_libexecdir}/atomic-devmode +%doc README.md +%license COPYING COPYING.LESSER + +%changelog +* Wed May 04 2016 Jonathan Lebon - 0.3.3-3 +- Apparently rpmbuild needs the patch lines to be before BuildArch + and ExcludeArch. It won't error, it will just silently ignore it... + +* Tue May 03 2016 Jonathan Lebon - 0.3.3-2 +- Add patch for pulling cockpit from RHEL registry + +* Mon May 02 2016 Jonathan Lebon - 0.3.3-1 +- Upstream release 0.3.3 +- Changelog at %{url}/releases/tag/v0.3.3 + +* Wed Apr 27 2016 Jonathan Lebon - 0.3.2-1 +- Upstream release 0.3.2. + +* Thu Feb 25 2016 Jonathan Lebon - 0.3.1-1 +- Upstream release 0.3.1.