Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Joanne Hugé
slapos
Commits
8204e968
Commit
8204e968
authored
Jul 11, 2013
by
Jondy Zhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner-lite: works both in the cygwin and linux
parent
125a4ebf
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
47 additions
and
38 deletions
+47
-38
component/curl/buildout.cfg
component/curl/buildout.cfg
+5
-0
component/dash/buildout.cfg
component/dash/buildout.cfg
+5
-0
component/dropbear/buildout.cfg
component/dropbear/buildout.cfg
+9
-32
component/dropbear/dropbear-0.53.1-cygwin.patch
component/dropbear/dropbear-0.53.1-cygwin.patch
+17
-0
component/git/buildout.cfg
component/git/buildout.cfg
+5
-0
software/slaprunner-lite/software.cfg
software/slaprunner-lite/software.cfg
+3
-3
software/slaprunner/software.cfg
software/slaprunner/software.cfg
+3
-3
No files found.
component/curl/buildout.cfg
View file @
8204e968
...
...
@@ -39,3 +39,8 @@ environment =
PATH=${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
LDFLAGS=-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib
[curl:cygwin]
share = /usr
promises =
/usr/bin/curl.exe
component/dash/buildout.cfg
View file @
8204e968
...
...
@@ -10,3 +10,8 @@ configure-options =
--disable-static
--disable-fnmatch
--disable-glob
[dash:cygwin]
share = /usr
promises =
/usr/bin/dash.exe
component/dropbear/buildout.cfg
View file @
8204e968
...
...
@@ -11,34 +11,6 @@ extends =
parts =
dropbear
[dropbear-userspace-patch]
recipe = hexagonit.recipe.download
md5sum = 3d934c2c90e8c57536a4fa2cf8ad216d
url = ${:_profile_base_location_}/${:filename}
filename = userspace.patch
download-only = true
[dropbear-ipv6-patch]
recipe = hexagonit.recipe.download
md5sum = b30dd58d68829a80eee69188134382ef
url = ${:_profile_base_location_}/${:filename}
filename = ipv6-support.patch
download-only = true
[dropbear-no-shell-check-patch]
recipe = hexagonit.recipe.download
md5sum = bb2ac410bd4cb2b07c23bfcc712e45f7
url = ${:_profile_base_location_}/${:filename}
filename = no-shell-checking.patch
download-only = true
[dropbear-static_build_fix.patch]
recipe = hexagonit.recipe.download
md5sum = 6e0ccc1949dfa31b4bc3951b9bb6472e
url = ${:_profile_base_location_}/${:filename}
filename = dropbear-0.53.1-static_build_fix.patch
download-only = true
[dropbear]
recipe = slapos.recipe.cmmi
md5sum = 0284ea239083f04c8b874e08e1aca243
...
...
@@ -56,10 +28,15 @@ environment =
LDFLAGS =-Wl,-rpath=${zlib:location}/lib -L${zlib:location}/lib
patches=
${
dropbear-userspace-patch:location}/${dropbear-userspace-patch:filename}
${
dropbear-ipv6-patch:location}/${dropbear-ipv6-patch:filename}
${
dropbear-no-shell-check-patch:location}/${dropbear-no-shell-check-patch:filename}
${
dropbear-static_build_fix.patch:location}/${dropbear-static_build_fix.patch:filename}
${
:_profile_base_location_}/userspace.patch
${
:_profile_base_location_}/ipv6-support.patch
${
:_profile_base_location_}/no-shell-checking.patch
${
:_profile_base_location_}/dropbear-0.53.1-static_build_fix.patch
patch-options=
-p1
[x86-cygwin-dropbear]
patches =
${dropbear:patches}
${:_profile_base_location_}/dropbear-0.53.1-cygwin.patch
component/dropbear/dropbear-0.53.1-cygwin.patch
0 → 100644
View file @
8204e968
diff --git a/Makefile.in b/Makefile.in
index 8d81647..d72828b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,10 +28,10 @@
COMMONOBJS=dbutil.o buffer.o \
queue.o \
atomicio.o compat.o fake-rfc2553.o
-SVROBJS=@CRYPTLIB@ svr-kex.o svr-algo.o svr-auth.o sshpty.o \
+SVROBJS=svr-kex.o svr-algo.o svr-auth.o sshpty.o \
svr-authpasswd.o svr-authpubkey.o svr-authpubkeyoptions.o svr-session.o svr-service.o \
svr-chansession.o svr-runopts.o svr-agentfwd.o svr-main.o svr-x11fwd.o\
- svr-tcpfwd.o svr-authpam.o
+ svr-tcpfwd.o svr-authpam.o @CRYPTLIB@
CLIOBJS=cli-algo.o cli-main.o cli-auth.o cli-authpasswd.o cli-kex.o \
cli-session.o cli-service.o cli-runopts.o cli-chansession.o \
component/git/buildout.cfg
View file @
8204e968
...
...
@@ -31,3 +31,8 @@ environment =
<= git
make-targets = install-gitweb
make-options = bindir="${git:location}/bin/"
[git:cygwin]
share = /usr
promises =
/usr/bin/git.exe
software/slaprunner-lite/software.cfg
View file @
8204e968
...
...
@@ -49,7 +49,7 @@ buildout-versions = 1.7
cns.recipe.symlink = 0.2.3
gitdb = 0.5.4
slapos.recipe.cmmi = 0.1.1
inotifyx = 0.2.0
inotifyx = 0.2.0
-1
lxml = 3.0.1
meld3 = 0.6.10
netaddr = 0.7.10
...
...
@@ -89,7 +89,7 @@ hexagonit.recipe.download = 1.6nxd002
# Required by:
# slapos.core==0.34
netifaces = 0.8
netifaces = 0.8
-1
# Required by:
# slapos.toolbox==0.34.0
...
...
@@ -97,7 +97,7 @@ paramiko = 1.9.0
# Required by:
# slapos.toolbox==0.34.0
psutil = 0.6.
1
psutil = 0.6.
2
# Required by:
# slapos.core==0.34
...
...
software/slaprunner/software.cfg
View file @
8204e968
...
...
@@ -49,7 +49,7 @@ buildout-versions = 1.7
cns.recipe.symlink = 0.2.3
gitdb = 0.5.4
hexagonit.recipe.cmmi = 1.6
inotifyx = 0.2.0
inotifyx = 0.2.0
-1
lxml = 3.0.1
meld3 = 0.6.10
netaddr = 0.7.10
...
...
@@ -89,7 +89,7 @@ hexagonit.recipe.download = 1.6nxd002
# Required by:
# slapos.core==0.34
netifaces = 0.8
netifaces = 0.8
-1
# Required by:
# slapos.toolbox==0.34.0
...
...
@@ -97,7 +97,7 @@ paramiko = 1.9.0
# Required by:
# slapos.toolbox==0.34.0
psutil = 0.6.
1
psutil = 0.6.
2
# Required by:
# slapos.core==0.34
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment