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

make, scripts: Remove /inst-source from RPM installation sources

Browse source 
Remove /inst-source from RPM installation sources, following
that same action within all repositories and mirrors

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-12-13 10:04:58 +00:00
commit 536d128f91
8 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/rpmdist.mk
View file

@ -78,7 +78,7 @@ RPM_CONFLICTS_RUN += $(call proj_query, pkg-conflicts --dont-expand-versi
RPM_UPLOAD_OS_NAME = $(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)/inst-source
RPM_UPLOAD_URLPREFIX ?= rsync_ssh://root@ftp.jannet.de:/srv/ftp/pub/packages/linux/$(RPM_UPLOAD_OS_NAME)/$(RPM_UPLOAD_OS_VERSION)
RPM_UPLOAD_USER ?= $(shell id -un)
RPM_UPLOAD_GROUP ?= $(shell id -gn)
RPM_UPLOAD_FILE_ATTRIB ?= 644:755:$(RPM_UPLOAD_USER).$(RPM_UPLOAD_GROUP)

4
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)
DISTRO_RELEASE = $(shell $(GET_OS_SH) | cut -d- -f2-)
UPLOAD_URL = root@ftp.jannet.de:/srv/ftp/pub/packages/linux/$(DISTRIBUTOR)/$(DISTRO_RELEASE)/inst-source/setup/descr
UPLOAD_URL = root@ftp.jannet.de:/srv/ftp/pub/packages/linux/$(DISTRIBUTOR)/$(DISTRO_RELEASE)/setup/descr
SELECTION = $(shell $(GENERATE_SELECTION) -s)-packages.txt
CHANNEL_LIST = $(shell $(GENERATE_SELECTION) -s)-channels.txt
@ -45,7 +45,7 @@ upload.done: selection.done
rpm-install-smart.done:
if ! rpm -q smart >/dev/null 2>&1 ; then \
wget ftp.jannet.de:/pub/packages/linux/$(DISTRIBUTOR)/$(DISTRO_RELEASE)/inst-source/rpm/i686/smart.rpm; \
wget ftp.jannet.de:/pub/packages/linux/$(DISTRIBUTOR)/$(DISTRO_RELEASE)/rpm/i686/smart.rpm; \
sudo rpm -U smart.rpm; \
sudo smart update; \
sudo smart channel --remove-all; \

2
make/suse-selection.mk
View file

@ -3,7 +3,7 @@ include $(MODDIR)/make/defs.mk
GENERATE_SELECTION = $(MOD_SCRIPT_DIR)/generate_selection.sh
SUSE_RELEASE = 10.1
UPLOAD_URL = root@ftp.jannet.de:/srv/ftp/pub/packages/linux/suse/$(SUSE_RELEASE)/inst-source/setup/descr
UPLOAD_URL = root@ftp.jannet.de:/srv/ftp/pub/packages/linux/suse/$(SUSE_RELEASE)/setup/descr
UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
SELECTION = $(shell sh $(GENERATE_SELECTION) -s).sel

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

@ -20,9 +20,9 @@
#OS_NAME = $(shell echo $(OS) | sed 's/-.*//')
#OS_VERSION = $(shell echo $(OS) | sed 's/[^-]\+-//')
#
## $(FTP_PCKG_DIR)/linux/$(OS_NAME)/$(OS_VERSION)/inst-source/rpm/src
## $(FTP_PCKG_DIR)/linux/$(OS_NAME)/$(OS_VERSION)/rpm/src
#FTP_PCKG_DIR ?= /pub/packages
#PCKG_ROOT ?= $(FTP_PCKG_DIR)/linux/$(OS_NAME)/$(OS_VERSION)/inst-source
#PCKG_ROOT ?= $(FTP_PCKG_DIR)/linux/$(OS_NAME)/$(OS_VERSION)
##PCKG_ROOT = $(FTP_PCKG_DIR)/$(RPM_PROJECT)
#CURRENT_SRC = $(warning PCKG_ROOT=$(PCKG_ROOT))$(PCKG_ROOT)/tgz/$(PCKG_TAR)
#CURRENT_RPM_RUN_I386 = $(PCKG_ROOT)/$(RPM_ARCH)/$(PCKG_RPM_RUN_I386)

4
scripts/integrate-distro.sh
View file

@ -616,8 +616,8 @@ cfg_default()
#update 0 ftp://ftp/pub/mirror/suse/update/$suse_version
[repos.payload]
#ftp.jannet.de 10 ftp://dspdev:123qweasd@ftp.jannet.de/pub/packages/linux/suse/$suse_version/inst-source
ftp.jannet.de 10 ftp://dspdev:123qweasd@ftp/pub/mirror/jannet/ftp/pub/packages/linux/suse/$suse_version/inst-source
#ftp.jannet.de 10 ftp://dspdev:123qweasd@ftp.jannet.de/pub/packages/linux/suse/$suse_version
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
[repos.special]

4
scripts/jannet
View file

@ -159,7 +159,7 @@ init)
echo -n "adding installation source ... "
sudo smart channel -y --add ftp.jannet.de \
type=yast2 \
baseurl=ftp://dspadm:dspasswd@ftp.jannet.de/pub/packages/linux/suse/10.1/inst-source \
baseurl=ftp://dspadm:dspasswd@ftp.jannet.de/pub/packages/linux/suse/10.1 \
>/dev/null 2>&1
if channel_present; then echo done; else echo failed; fi
fi
@ -204,7 +204,7 @@ info)
;;
cpp-glib)
sudo rpm -U --replacefiles --replacepkgs --oldpackage \
ftp://dspadm@ftp.jannet.de/pub/packages/linux/suse/10.1/inst-source/rpm/i586/glib2-2.8.5-19.i586.rpm
ftp://dspadm@ftp.jannet.de/pub/packages/linux/suse/10.1/rpm/i586/glib2-2.8.5-19.i586.rpm
check_ldconfig
;;
rpmnew)

4
scripts/jw-pkg
View file

@ -358,7 +358,7 @@ init)
echo -n "adding installation source ... "
sudo smart channel -y --add ftp.jannet.de \
type=yast2 \
baseurl=ftp://dspadm:dspasswd@ftp.jannet.de/pub/packages/linux/suse/10.1/inst-source \
baseurl=ftp://dspadm:dspasswd@ftp.jannet.de/pub/packages/linux/suse/10.1 \
>/dev/null 2>&1
if channel_present; then echo done; else echo failed; fi
fi
@ -406,7 +406,7 @@ list_projects)
;;
cpp_glib)
sudo rpm -U --replacefiles --replacepkgs --oldpackage \
ftp://dspadm@ftp.jannet.de/pub/packages/linux/suse/10.1/inst-source/rpm/i586/glib2-2.8.5-19.i586.rpm
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)

2
scripts/pkg.sh
View file

@ -522,7 +522,7 @@ upload_file()
}
local os_name=`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/inst-source
local target_base=rsync_ssh://root@ftp.jannet.de:/srv/ftp/pub/packages/linux/$os_name/$os_version
[ "$upload_urlbase" ] && target_base="$upload_urlbase"
local upload_attrib=644:755:`id -un`.207
[ "$upload_file_attrib" ] && upload_attrib="$upload_file_attrib"