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

$(TOPDIR), make, scripts: Ftp.jannet.de / ftp.janware.com -> pkg.janware.com

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-12-16 16:11:11 +00:00
commit f4efde3377
11 changed files with 61 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,6 +1,6 @@
TOPDIR = . TOPDIR = .
SUBDIRS = make scripts bin htdocs tmpl conf SUBDIRS = make scripts bin htdocs tmpl conf
RPM_UPLOAD_URLPREFIX ?= rsync_ssh://$(JANWARE_USER)@ftp.janware.com:/srv/ftp/pub/packages/jw-foss/$(RPM_UPLOAD_OS_NAME)/$(RPM_UPLOAD_OS_VERSION) RPM_UPLOAD_URLPREFIX ?= rsync_ssh://$(JANWARE_USER)@pkg.janware.com:/srv/ftp/pub/packages/jw-foss/$(RPM_UPLOAD_OS_NAME)/$(RPM_UPLOAD_OS_VERSION)
include $(TOPDIR)/make/proj.mk include $(TOPDIR)/make/proj.mk
include $(MODDIR)/make/topdir.mk include $(MODDIR)/make/topdir.mk

4
make/linux-rpm-build.mk
View file

@ -13,8 +13,8 @@ KERNEL_PKG_SUFFIX ?= .tar.gz
CUSTOMER ?= jannet CUSTOMER ?= jannet
KERNEL_DLOAD_DIR ?= /home/samba/dat/exe/linux/os KERNEL_DLOAD_DIR ?= /home/samba/dat/exe/linux/os
KERNEL_PKG ?= $(KERNEL_DLOAD_DIR)/$(shell echo $(KERNEL_VERSION) | $(SED) 's/\([0-9]\.[0-9]*\)\..*/\1/')/linux-$(shell echo $(KERNEL_VERSION) | $(SED) 's/\(2\.6\.[0-9]+\)-..*/\1/')$(KERNEL_PKG_SUFFIX) KERNEL_PKG ?= $(KERNEL_DLOAD_DIR)/$(shell echo $(KERNEL_VERSION) | $(SED) 's/\([0-9]\.[0-9]*\)\..*/\1/')/linux-$(shell echo $(KERNEL_VERSION) | $(SED) 's/\(2\.6\.[0-9]+\)-..*/\1/')$(KERNEL_PKG_SUFFIX)
UPLOAD_HOST ?= ftp.jannet.de UPLOAD_HOST ?= pkg.janware.com
UPLOAD_PATH ?= /srv/ftp/pub/packages/$(CUSTOMER)/$(KERNEL_BASE) UPLOAD_PATH ?= /srv/dav/pub/packages/$(CUSTOMER)/$(KERNEL_BASE)
UPLOAD_OWNER ?= $(shell whoami) UPLOAD_OWNER ?= $(shell whoami)
KERNEL_MAJOR = $(shell echo $(KERNEL_VERSION) | cut -d\. -f1) KERNEL_MAJOR = $(shell echo $(KERNEL_VERSION) | cut -d\. -f1)

7
make/rpmdist.mk
View file

@ -10,10 +10,9 @@ FTP_RUN_GROUP ?= $(shell id -g)
FTP_RUN_USER ?= $(shell whoami) FTP_RUN_USER ?= $(shell whoami)
FTP_DEV_GROUP ?= $(shell id -g) FTP_DEV_GROUP ?= $(shell id -g)
FTP_DEV_USER ?= $(shell whoami) FTP_DEV_USER ?= $(shell whoami)
FTP_HOST ?= ftp.jannet.de FTP_HOST ?= pkg.janware.com
FTP_FILE_MODE ?= 644 FTP_FILE_MODE ?= 644
FTP_DIR_MODE ?= 755 FTP_DIR_MODE ?= 755
FTP_HOST ?= ftp.jannet.de
FTP_HOST_LOGIN ?= root FTP_HOST_LOGIN ?= root
RPM_VERSION ?= $(DIST_VERSION) RPM_VERSION ?= $(DIST_VERSION)
RELEASES_FILE = $(TOPDIR)/RELEASES$(FLAVOUR_SUFFIX) RELEASES_FILE = $(TOPDIR)/RELEASES$(FLAVOUR_SUFFIX)
@ -24,7 +23,7 @@ CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true
HASH = $(shell $(cvs_files) -z | \ HASH = $(shell $(cvs_files) -z | \
grep -vz "CHANGES\|VERSION\|HASH\|MD5SUMS\|_RPM_RUN" | \ grep -vz "CHANGES\|VERSION\|HASH\|MD5SUMS\|_RPM_RUN" | \
xargs -0 md5sum | md5sum | $(SED) 's/ .*//') xargs -0 md5sum | md5sum | $(SED) 's/ .*//')
LOCAL_REPO ?= /srv/ftp/pub/local/packages/suse/11.4 LOCAL_REPO ?= /srv/dav/pub/local/packages/suse/$(OS)
include $(MODDIR)/make/tag-defs.mk include $(MODDIR)/make/tag-defs.mk
@ -78,7 +77,7 @@ RPM_CONFLICTS_RUN += $(call proj_query, pkg-conflicts --dont-expand-versi
RPM_UPLOAD_OS_NAME = $(shell echo $(OS) | sed 's/-.*//') RPM_UPLOAD_OS_NAME = $(shell echo $(OS) | sed 's/-.*//')
RPM_UPLOAD_OS_VERSION = $(shell echo $(OS) | sed 's/[^-]\+-//') RPM_UPLOAD_OS_VERSION = $(shell echo $(OS) | sed 's/[^-]\+-//')
RPM_UPLOAD_URLPREFIX ?= rsync_ssh://root@ftp.jannet.de:/srv/ftp/pub/packages/linux/$(RPM_UPLOAD_OS_NAME)/$(RPM_UPLOAD_OS_VERSION) RPM_UPLOAD_URLPREFIX ?= rsync_ssh://root@pkg.janware.com:/srv/dav/pub/packages/linux/$(RPM_UPLOAD_OS_NAME)/$(RPM_UPLOAD_OS_VERSION)
RPM_UPLOAD_USER ?= $(shell id -un) RPM_UPLOAD_USER ?= $(shell id -un)
RPM_UPLOAD_GROUP ?= $(shell id -gn) RPM_UPLOAD_GROUP ?= $(shell id -gn)
RPM_UPLOAD_FILE_ATTRIB ?= 644:755:$(RPM_UPLOAD_USER).$(RPM_UPLOAD_GROUP) RPM_UPLOAD_FILE_ATTRIB ?= 644:755:$(RPM_UPLOAD_USER).$(RPM_UPLOAD_GROUP)

6
make/smart-selection.mk
View file

@ -5,7 +5,7 @@ UPLOAD_SH = sh $(MOD_SCRIPT_DIR)/upload.sh
DISTRIBUTOR = $(shell $(GET_OS_SH) | cut -d- -f1) DISTRIBUTOR = $(shell $(GET_OS_SH) | cut -d- -f1)
DISTRO_RELEASE = $(shell $(GET_OS_SH) | cut -d- -f2-) DISTRO_RELEASE = $(shell $(GET_OS_SH) | cut -d- -f2-)
UPLOAD_URL = root@ftp.jannet.de:/srv/ftp/pub/packages/linux/$(DISTRIBUTOR)/$(DISTRO_RELEASE)/setup/descr UPLOAD_URL = root@pkg.janware.com:/srv/ftp/pub/packages/linux/$(DISTRIBUTOR)/$(DISTRO_RELEASE)/setup/descr
SELECTION = $(shell $(GENERATE_SELECTION) -s)-packages.txt SELECTION = $(shell $(GENERATE_SELECTION) -s)-packages.txt
CHANNEL_LIST = $(shell $(GENERATE_SELECTION) -s)-channels.txt CHANNEL_LIST = $(shell $(GENERATE_SELECTION) -s)-channels.txt
@ -40,12 +40,12 @@ channels.done: $(MODDIR)/make/smart-selection.mk
upload.done: selection.done upload.done: selection.done
sh $(UPLOAD_SH) $(SELECTION) $(CHANNEL_LIST) $(UPLOAD_URL) sh $(UPLOAD_SH) $(SELECTION) $(CHANNEL_LIST) $(UPLOAD_URL)
$(CVS_RSH) -l root ftp.jannet.de $(UPDATE_REPO_SH) $(CVS_RSH) -l root pkg.janware.com $(UPDATE_REPO_SH)
touch $@ touch $@
rpm-install-smart.done: rpm-install-smart.done:
if ! rpm -q smart >/dev/null 2>&1 ; then \ if ! rpm -q smart >/dev/null 2>&1 ; then \
wget ftp.jannet.de:/pub/packages/linux/$(DISTRIBUTOR)/$(DISTRO_RELEASE)/rpm/i686/smart.rpm; \ wget --http-user=$(JANWARE_USER) https://janware.com:/files/packages/linux/$(DISTRIBUTOR)/$(DISTRO_RELEASE)/rpm/i686/smart.rpm; \
sudo rpm -U smart.rpm; \ sudo rpm -U smart.rpm; \
sudo smart update; \ sudo smart update; \
sudo smart channel --remove-all; \ sudo smart channel --remove-all; \

4
make/suse-selection.mk
View file

@ -3,7 +3,7 @@ include $(MODDIR)/make/defs.mk
GENERATE_SELECTION = $(MOD_SCRIPT_DIR)/generate_selection.sh GENERATE_SELECTION = $(MOD_SCRIPT_DIR)/generate_selection.sh
SUSE_RELEASE = 10.1 SUSE_RELEASE = 10.1
UPLOAD_URL = root@ftp.jannet.de:/srv/ftp/pub/packages/linux/suse/$(SUSE_RELEASE)/setup/descr UPLOAD_URL = root@pkg.janware.com:/srv/dav/pub/packages/linux/suse/$(SUSE_RELEASE)/setup/descr
UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
SELECTION = $(shell sh $(GENERATE_SELECTION) -s).sel SELECTION = $(shell sh $(GENERATE_SELECTION) -s).sel
@ -19,5 +19,5 @@ clean:
upload.done: $(SELECTION) upload.done: $(SELECTION)
sh $(UPLOAD_SH) $(SELECTION) $(UPLOAD_URL) sh $(UPLOAD_SH) $(SELECTION) $(UPLOAD_URL)
$(CVS_RSH) -l root ftp.jannet.de $(UPDATE_REPO_SH) $(CVS_RSH) -l root pkg.janware.com $(UPDATE_REPO_SH)
touch $@ touch $@

2
make/upload-defs-rpm.mk
View file

@ -14,7 +14,7 @@
#FTP_RUN_USER ?= $(shell whoami) #FTP_RUN_USER ?= $(shell whoami)
#FTP_DEV_GROUP ?= spiddev #FTP_DEV_GROUP ?= spiddev
#FTP_DEV_USER ?= $(shell whoami) #FTP_DEV_USER ?= $(shell whoami)
#FTP_HOST ?= ftp.jannet.de #FTP_HOST ?= pkg.janware.com
#FTP_HOST_LOGIN ?= root #FTP_HOST_LOGIN ?= root
# #
#OS_NAME = $(shell echo $(OS) | sed 's/-.*//') #OS_NAME = $(shell echo $(OS) | sed 's/-.*//')

3
scripts/integrate-distro.sh
View file

@ -616,8 +616,7 @@ cfg_default()
#update 0 ftp://ftp/pub/mirror/suse/update/$suse_version #update 0 ftp://ftp/pub/mirror/suse/update/$suse_version
[repos.payload] [repos.payload]
#ftp.jannet.de 10 ftp://dspdev:123qweasd@ftp.jannet.de/pub/packages/linux/suse/$suse_version jw-foss 10 https://pkg:we0rntj3p@janware.com/files/packages/jw-foss/suse/$suse_version?auth=basic&credentials=jannet.cat
ftp.jannet.de 10 ftp://dspdev:123qweasd@ftp/pub/mirror/jannet/ftp/pub/packages/linux/suse/$suse_version
ftp.priv.lcl 5 ftp://dspdev:123qweasd@ftp.priv.lcl/pub/local/packages/suse/$suse_version ftp.priv.lcl 5 ftp://dspdev:123qweasd@ftp.priv.lcl/pub/local/packages/suse/$suse_version
[repos.special] [repos.special]

19
scripts/jannet
View file

@ -155,32 +155,32 @@ get_opts $*
case $cmd in case $cmd in
init) init)
if ! channel_present ftp.jannet.de; then if ! channel_present jw-foss; then
echo -n "adding installation source ... " echo -n "adding installation source ... "
sudo smart channel -y --add ftp.jannet.de \ sudo smart channel -y --add jw-foss \
type=yast2 \ type=yast2 \
baseurl=ftp://dspadm:dspasswd@ftp.jannet.de/pub/packages/linux/suse/10.1 \ baseurl=https://pkg:we0rntj3p@janware.com/files/packages/jw-foss/suse/tumbleweed?auth=basic&credentials=jannet.cat \
>/dev/null 2>&1 >/dev/null 2>&1
if channel_present; then echo done; else echo failed; fi if channel_present; then echo done; else echo failed; fi
fi fi
;; ;;
uninit) uninit)
if channel_present ftp.jannet.de; then if channel_present jw-foss; then
echo -n "removing installation source ... " echo -n "removing installation source ... "
sudo smart channel -y --remove ftp.jannet.de >/dev/null 2>&1 sudo smart channel -y --remove jw-foss >/dev/null 2>&1
echo done echo done
fi fi
;; ;;
update) update)
sudo smart update ftp.jannet.de sudo smart update jw-foss
sudo smart upgrade -y sudo smart upgrade -y
check_ldconfig check_ldconfig
;; ;;
install) install)
sudo smart update ftp.jannet.de sudo smart update jw-foss
if [ -f $1 ]; then if [ -f $1 ]; then
sudo smart install -y `cat $1` sudo smart install -y `cat $1`
else else
@ -202,11 +202,6 @@ info)
list_all_packages | xargs rpm -q list_all_packages | xargs rpm -q
fi fi
;; ;;
cpp-glib)
sudo rpm -U --replacefiles --replacepkgs --oldpackage \
ftp://dspadm@ftp.jannet.de/pub/packages/linux/suse/10.1/rpm/i586/glib2-2.8.5-19.i586.rpm
check_ldconfig
;;
rpmnew) rpmnew)
cmd_rpmnew $@ cmd_rpmnew $@
;; ;;

84
scripts/jw-pkg
View file

@ -353,47 +353,44 @@ shift
case $cmd in case $cmd in
init) # -- TODO: re-implement this using pkg-manager.sh, or integrate with pkg-manager.sh
if ! channel_present ftp.jannet.de; then #init)
echo -n "adding installation source ... " # if ! channel_present ftp.jannet.de; then
sudo smart channel -y --add ftp.jannet.de \ # echo -n "adding installation source ... "
type=yast2 \ # sudo smart channel -y --add ftp.jannet.de \
baseurl=ftp://dspadm:dspasswd@ftp.jannet.de/pub/packages/linux/suse/10.1 \ # type=yast2 \
>/dev/null 2>&1 # baseurl=ftp://dspadm:dspasswd@ftp.jannet.de/pub/packages/linux/suse/10.1 \
if channel_present; then echo done; else echo failed; fi # >/dev/null 2>&1
fi # if channel_present; then echo done; else echo failed; fi
;; # fi
# ;;
uninit) #
if channel_present ftp.jannet.de; then #uninit)
echo -n "removing installation source ... " # if channel_present ftp.jannet.de; then
sudo smart channel -y --remove ftp.jannet.de >/dev/null 2>&1 # echo -n "removing installation source ... "
echo done # sudo smart channel -y --remove ftp.jannet.de >/dev/null 2>&1
fi # echo done
;; # fi
# ;;
update) #
sudo smart update ftp.jannet.de #update)
sudo smart upgrade -y # sudo smart update ftp.jannet.de
check_ldconfig # sudo smart upgrade -y
;; # check_ldconfig
# ;;
install) #
sudo smart update ftp.jannet.de #install)
if [ -f $1 ]; then # sudo smart update ftp.jannet.de
sudo smart install -y `cat $1` # if [ -f $1 ]; then
else # sudo smart install -y `cat $1`
sudo smart install -y $* # else
fi # sudo smart install -y $*
check_ldconfig # fi
;; # check_ldconfig
restore) # ;;
echo "not yet implemented, sorry" >&2 #restore)
;; # echo "not yet implemented, sorry" >&2
checklog) # ;;
line=`jannet info | tr -s " "`
echo $line
;;
list) list)
if [ "$opt_verbose" = true ]; then if [ "$opt_verbose" = true ]; then
list_packages "$@" | xargs -r rpm -qi list_packages "$@" | xargs -r rpm -qi
@ -404,11 +401,6 @@ list)
list_projects) list_projects)
list_projects "$@" list_projects "$@"
;; ;;
cpp_glib)
sudo rpm -U --replacefiles --replacepkgs --oldpackage \
ftp://dspadm@ftp.jannet.de/pub/packages/linux/suse/10.1/rpm/i586/glib2-2.8.5-19.i586.rpm
check_ldconfig "$@"
;;
compile_templates|list_templates|list_template_tables|list_template_output|rm_template_output|diff|build_date|built_today|rpmnew) compile_templates|list_templates|list_template_tables|list_template_output|rm_template_output|diff|build_date|built_today|rpmnew)
cmd_$cmd "$@" cmd_$cmd "$@"
;; ;;

4
scripts/pkg.sh
View file

@ -522,7 +522,7 @@ upload_file()
} }
local os_name=`os | sed 's/-.*//'` local os_name=`os | sed 's/-.*//'`
local os_version=`os | sed 's/[^-]\+-//'` local os_version=`os | sed 's/[^-]\+-//'`
local target_base=rsync_ssh://root@ftp.jannet.de:/srv/ftp/pub/packages/linux/$os_name/$os_version local target_base=rsync_ssh://root@pkg.janware.com:/srv/dav/pub/packages/linux/$os_name/$os_version
[ "$upload_urlbase" ] && target_base="$upload_urlbase" [ "$upload_urlbase" ] && target_base="$upload_urlbase"
local upload_attrib=644:755:`id -un`.207 local upload_attrib=644:755:`id -un`.207
[ "$upload_file_attrib" ] && upload_attrib="$upload_file_attrib" [ "$upload_file_attrib" ] && upload_attrib="$upload_file_attrib"
@ -569,7 +569,7 @@ upload_pkg()
local h=`calculate_hash` local h=`calculate_hash`
case $PKG_FORMAT in case $PKG_FORMAT in
rpm) rpm)
server=ftp.jannet.de server=pkg.janware.com
upload_file $RPM_PROJECT-$v.tar.bz2 tgz upload_file $RPM_PROJECT-$v.tar.bz2 tgz
upload_file $RPM_PROJECT-$v.src.rpm src upload_file $RPM_PROJECT-$v.src.rpm src
upload_file $RPM_PROJECT-run-$v.$RPM_ARCH.rpm $RPM_ARCH upload_file $RPM_PROJECT-run-$v.$RPM_ARCH.rpm $RPM_ARCH

2
scripts/upload.sh
View file

@ -30,7 +30,7 @@
MYNAME=`basename $0` MYNAME=`basename $0`
HOST=ftp.jannet.de HOST=pkg.janware.com
CFG_FILE=$HOME/.uploadrc CFG_FILE=$HOME/.uploadrc
login=`whoami` login=`whoami`