janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

OS building scripts: Replace ytools -> jw-build

Browse source 
Replace some legacy ytools references by jw-build in
integrate-distro.sh and jw-build-create-project.sh.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-04-22 18:57:04 +00:00
commit e3e401291b
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/integrate-distro.sh
View file

@ -1351,7 +1351,7 @@ cmd_install()
kernel_version=`run_chroot -q rpm -q kernel | sort -V | sed 's/_/-/g; s/\.\(i386\|x86_64\)$//; s/-[^.-]\+$//; s/^kernel-//'` kernel_version=`run_chroot -q rpm -q kernel | sort -V | sed 's/_/-/g; s/\.\(i386\|x86_64\)$//; s/-[^.-]\+$//; s/^kernel-//'`
# TODO: should be done by package manager post install script # TODO: should be done by package manager post install script
run_chroot /opt/ytools/bin/jcs init run_chroot /opt/jw-build/bin/jcs init
make_etc_jcs_jcs_conf > $root/etc/jcs/jcs.conf make_etc_jcs_jcs_conf > $root/etc/jcs/jcs.conf

13
scripts/jw-build-create-project.sh
View file

@ -59,7 +59,7 @@ cat_make_proj_mk()
ifeq (\$(TARGET),mingw) ifeq (\$(TARGET),mingw)
FLAVOUR_PATH_PREFIX = win32/ FLAVOUR_PATH_PREFIX = win32/
endif endif
MODDIR = \$(firstword \$(wildcard \$(CVS_PROJ_DIR)/ytools /opt/\$(FLAVOUR_PATH_PREFIX)ytools)) MODDIR = \$(firstword \$(wildcard \$(CVS_PROJ_DIR)/jw-build /opt/\$(FLAVOUR_PATH_PREFIX)jw-build))
USE_PROJECT_LIB = false USE_PROJECT_LIB = false
HDRDIR_SCOPE_SUFFIX = \$(PROJECT) HDRDIR_SCOPE_SUFFIX = \$(PROJECT)
@ -78,11 +78,16 @@ cat_make_project_conf()
[global] [global]
group = "$pkg_group" group = "$pkg_group"
subpackages = $subpackages subpackages = $subpackages
license = LGPL 2
jw-maintainer = $JANWARE_USER
[build]
libname = none
[pkg.required.jw] [pkg.required.jw]
run = ytools-run = VERSION run = jw-build-run = VERSION
devel = $name-run = VERSION-REVISION, ytools-devel = VERSION devel = $name-run = VERSION-REVISION, jw-build-devel = VERSION
build = ytools-devel build = jw-build-devel
EOT EOT
} }