Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ded521736b3f93d4094c8888c2e3382c0822dda3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ded521736b3f93d4094c8888c2e3382c0822dda3)
  • Date: Tue, 29 Sep 2015 16:11:51 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

dev/null |binary
utils/dockerio/DETAILS | 11 ++++----
utils/dockerio/HISTORY | 5 +++
utils/dockerio/PREPARE | 41
++++++++++++++++++++++++++++++++
utils/dockerio/PRE_BUILD | 42
---------------------------------
utils/dockerio/docker-1.8.2.tar.gz.sig |binary
6 files changed, 52 insertions(+), 47 deletions(-)

New commits:
commit ded521736b3f93d4094c8888c2e3382c0822dda3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

dockerio: => 1.8.2

diff --git a/utils/dockerio/DETAILS b/utils/dockerio/DETAILS
index 9d339cf..e98aade 100755
--- a/utils/dockerio/DETAILS
+++ b/utils/dockerio/DETAILS
@@ -1,10 +1,11 @@
SPELL=dockerio
- VERSION=1.6.2
- SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SPELLX=${SPELL/io/}
+ VERSION=1.8.2
+DOCKER_GITCOMMIT='0a8c2e3' # Because Docker building is dumb
+ SOURCE="${SPELLX}-${VERSION}.tar.gz"
+
SOURCE_URL[0]="http://github.com/${SPELLX}/${SPELLX}/archive/v${VERSION}.tar.gz";
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL/io/}-${VERSION}"
-DOCKER_GITCOMMIT='7c8fca2' # Because Docker building is dumb
- SOURCE_URL[0]="http://github.com/docker/docker/archive/v${VERSION}.tar.gz";
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
WEB_SITE='https://github.com/docker/docker'
ENTERED='20150526'
LICENSE[0]='APACHE2'
diff --git a/utils/dockerio/HISTORY b/utils/dockerio/HISTORY
index 3cbbbbc..0b4b0b8 100644
--- a/utils/dockerio/HISTORY
+++ b/utils/dockerio/HISTORY
@@ -1,3 +1,8 @@
+2015-09-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.2; use SPELLX
+ * PRE_BUILD: moved to PREPARE
+ * PREPARE: sync with 1.8.2 (contrib/check-config.sh)
+
2015-05-26 Eric Sandall <sandalle AT sourcemage.org>
* Created based on
https://github.com/tianon/docker-overlay/blob/master/app-emulation/docker/docker-1.6.2.ebuild
* init.d/* modified from contrib/init/sysvinit-redhat/
diff --git a/utils/dockerio/PREPARE b/utils/dockerio/PREPARE
new file mode 100755
index 0000000..2cff183
--- /dev/null
+++ b/utils/dockerio/PREPARE
@@ -0,0 +1,41 @@
+. "${GRIMOIRE}/FUNCTIONS" &&
+
+local DOCKERIO_KERNEL_OK=0 &&
+
+if [[ $(get_kernel_version | cut -d. -f1 | sed -e 's/\.//g') -le 3 ]] &&
+ [[ $(get_kernel_version | cut -d. -f2 | sed -e 's/\.//g') -lt 10 ]]; then
+ message "${PROBLEM_COLOR}Requires Linux kernel 3.10+${DEFAULT_COLOR}" &&
+ return 1
+fi &&
+
+for KERNELPARAM in CGROUPS CGROUP_CPUACCT CGROUP_DEVICE CGROUP_FREEZER \
+ CGROUP_SCHED CPUSETS DEVPTS_MULTIPLE_INSTANCES MACVLAN MEMCG \
+ VETH BRIDGE BRIDGE_NETFILTER NAMESPACES NET_NS PID_NS IPC_NS UTS_NS \
+ NETFILTER_XT_MATCH_ADDRTYPE NETFILTER_XT_MATCH_CONNTRACK NF_NAT \
+ NF_NAT_NEEDED NF_NAT_IPV4 IP_NF_FILTER IP_NF_TARGET_MASQUERADE POSIX_MQUEUE
+do
+ local DOCKERIO_KERNEL_CHECK=$(get_kernel_config CONFIG_${KERNELPARAM}) &&
+
+ if [[ "${DOCKERIO_KERNEL_CHECK}" != "y" && "${DOCKERIO_KERNEL_CHECK}" !=
"m" ]]; then
+ message "${PROBLEM_COLOR}You don't have CONFIG_${KERNELPARAM}" \
+ "enabled in your kernel configuration, cannot build" \
+ "${SPELL_COLOR}$SPELL${MESSAGE_COLOR}.${DEFAULT_COLOR}" &&
+ DOCKERIO_KERNEL_OK=1 # There is an error!
+ else
+ message "${MESSAGE_COLOR}Checking for CONFIG_${KERNELPARAM} in your
kernel... ${SPELL_COLOR}OK${DEFAULT_COLOR}"
+ fi
+done &&
+
+if is_depends_enabled "${SPELL}" 'btrfs-progs'; then
+ DOCKERIO_KERNEL_BTRFS=$(get_kernel_config CONFIG_BTRFS_FS) &&
+ if [[ "${DOCKERIO_KERNEL_BTRFS}" != "y" && "${DOCKERIO_KERNEL_BTRFS}" !=
"m" ]]; then
+ message "${PROBLEM_COLOR}You don't have CONFIG_BTRFS_FS" \
+ "enabled in your kernel configuration, cannot build" \
+ "${SPELL_COLOR}$SPELL${MESSAGE_COLOR}.${DEFAULT_COLOR}" &&
+ DOCKERIO_KERNEL_OK=1 # There is an error!
+ else
+ message "${MESSAGE_COLOR}Checking for CONFIG_BTRFS_FS in your
kernel...${SPELL_COLOR}OK${DEFAULT_COLOR}"
+ fi
+fi &&
+
+[[ ${DOCKERIO_KERNEL_OK} -eq 0 ]] || return 1 # There was at least one error
diff --git a/utils/dockerio/PRE_BUILD b/utils/dockerio/PRE_BUILD
deleted file mode 100755
index 93d5de6..0000000
--- a/utils/dockerio/PRE_BUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-local DOCKERIO_KERNEL_OK=0 &&
-
-
-if [[ $(get_kernel_version | cut -d. -f1 | sed -e 's/\.//g') -le 3 ]] &&
- [[ $(get_kernel_version | cut -d. -f2 | sed -e 's/\.//g') -lt 10 ]]; then
- message "${PROBLEM_COLOR}Requires Linux kernel 3.10+${DEFAULT_COLOR}" &&
- return 1
-fi &&
-
-for KERNELPARAM in CGROUPS CGROUP_CPUACCT CGROUP_DEVICE CGROUP_FREEZER
\
- CGROUP_SCHED CPUSETS DEVPTS_MULTIPLE_INSTANCES DM_THIN_PROVISIONING
MACVLAN \
- VETH BRIDGE NAMESPACES NET_NS PID_NS IPC_NS UTS_NS NETFILTER_ADVANCED
\
- NETFILTER_XT_MATCH_ADDRTYPE NETFILTER_XT_MATCH_CONNTRACK NF_NAT
\
- NF_NAT_NEEDED NF_NAT_IPV4 IP_NF_FILTER IP_NF_TARGET_MASQUERADE POSIX_MQUEUE
-do
- local DOCKERIO_KERNEL_CHECK=$(get_kernel_config CONFIG_${KERNELPARAM}) &&
-
- if [[ "${DOCKERIO_KERNEL_CHECK}" != "y" && "${DOCKERIO_KERNEL_CHECK}" !=
"m" ]]; then
- message "${PROBLEM_COLOR}You don't have CONFIG_${KERNELPARAM}" \
- "enabled in your kernel configuration, cannot build" \
- "${SPELL_COLOR}$SPELL${MESSAGE_COLOR}.${DEFAULT_COLOR}" &&
- DOCKERIO_KERNEL_OK=1 # There is an error!
- else
- message "${MESSAGE_COLOR}Checking for CONFIG_${KERNELPARAM} in your
kernel...${SPELL_COLOR}OK${DEFAULT_COLOR}"
- fi
-done &&
-
-if is_depends_enabled "${SPELL}" 'btrfs-progs'; then
- DOCKERIO_KERNEL_BTRFS=$(get_kernel_config CONFIG_BTRFS_FS) &&
- if [[ "${DOCKERIO_KERNEL_BTRFS}" != "y" && "${DOCKERIO_KERNEL_BTRFS}" !=
"m" ]]; then
- message "${PROBLEM_COLOR}You don't have CONFIG_BTRFS_FS" \
- "enabled in your kernel configuration, cannot build" \
- "${SPELL_COLOR}$SPELL${MESSAGE_COLOR}.${DEFAULT_COLOR}" &&
- DOCKERIO_KERNEL_OK=1 # There is an error!
- else
- message "${MESSAGE_COLOR}Checking for CONFIG_BTRFS_FS in your
kernel...${SPELL_COLOR}OK${DEFAULT_COLOR}"
- fi
-fi &&
-
-[[ ${DOCKERIO_KERNEL_OK} -eq 0 ]] || return 1 && # There was at least one
error
-
-default_pre_build
diff --git a/utils/dockerio/docker-1.8.2.tar.gz.sig
b/utils/dockerio/docker-1.8.2.tar.gz.sig
new file mode 100644
index 0000000..1361977
Binary files /dev/null and b/utils/dockerio/docker-1.8.2.tar.gz.sig differ
diff --git a/utils/dockerio/dockerio-1.6.2.tar.gz.sig
b/utils/dockerio/dockerio-1.6.2.tar.gz.sig
deleted file mode 100644
index b8b3fc2..0000000
Binary files a/utils/dockerio/dockerio-1.6.2.tar.gz.sig and /dev/null differ



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ded521736b3f93d4094c8888c2e3382c0822dda3), Vlad Glagolev, 09/29/2015

Archive powered by MHonArc 2.6.24.

Top of Page