Skip to content

Commit b2a920c

Browse files
committed
BUGFIX: we should specify rpm package dependencies in the spec file, not in frontend-install.py
1 parent a12291c commit b2a920c

2 files changed

Lines changed: 1 addition & 6 deletions

File tree

common/src/stack/command/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ROLLROOT = ../../../..
1515
DEPENDS.DIRS = stack
1616
DEPENDS.FILES = stack.py
1717
PY.TEST.FLAGS = -s
18-
RPM.REQUIRES = foundation-python-Jinja2
18+
RPM.REQUIRES = foundation-python-Jinja2 foundation-python-jsoncomment foundation-python-PyYAML foundation-python-PyMySQL stack-templates
1919

2020
include $(STACKBUILD)/etc/CCRules.mk
2121

tools/fab/frontend-install.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,6 @@ def usage():
274274

275275
pkgs = [
276276
'foundation-python',
277-
'foundation-python-PyMySQL',
278277
'stack-command',
279278
'stack-pylib',
280279
'stack-mq',
@@ -290,11 +289,7 @@ def usage():
290289

291290
# Workaround to add new packages but not break this script for older stacki releases
292291
new_pkgs = [
293-
'stack-templates',
294292
'stack-probepal',
295-
'foundation-python-jsoncomment',
296-
'foundation-python-json-spec',
297-
'foundation-python-six',
298293
]
299294

300295
for new_pkg in new_pkgs:

0 commit comments

Comments
 (0)