mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-24 22:50:39 +01:00
smart-selection.mk: Fix MOD_SCRIPT_DIR
- Fix MOD_SCRIPT_DIR - Beautify selection creation
This commit is contained in:
parent
2b175d6729
commit
43c457e635
1 changed files with 11 additions and 11 deletions
|
|
@ -1,4 +1,4 @@
|
||||||
MOD_SCRIPT_DIR = $(MODDIR)/lib/devutil/scripts
|
MOD_SCRIPT_DIR = $(MODDIR)/devutil/scripts
|
||||||
GENERATE_SELECTION = $(MOD_SCRIPT_DIR)/generate_selection.sh
|
GENERATE_SELECTION = $(MOD_SCRIPT_DIR)/generate_selection.sh
|
||||||
SUSE_RELEASE = $(shell sed '/VERSION *=/ !d; s/VERSION *= *//' /etc/SuSE-release)
|
SUSE_RELEASE = $(shell sed '/VERSION *=/ !d; s/VERSION *= *//' /etc/SuSE-release)
|
||||||
UPLOAD_URL = root@ftp.jannet.de:/home/ftp/dat/pub/packages/linux/suse/$(SUSE_RELEASE)/inst-source/setup/descr
|
UPLOAD_URL = root@ftp.jannet.de:/home/ftp/dat/pub/packages/linux/suse/$(SUSE_RELEASE)/inst-source/setup/descr
|
||||||
|
|
@ -6,17 +6,17 @@ UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
|
||||||
|
|
||||||
SELECTION = $(shell sh $(GENERATE_SELECTION) -s).txt
|
SELECTION = $(shell sh $(GENERATE_SELECTION) -s).txt
|
||||||
|
|
||||||
all: $(SELECTION)
|
all: selection.done
|
||||||
upload: upload.done
|
upload: upload.done
|
||||||
|
|
||||||
$(SELECTION):
|
selection.done:
|
||||||
rpm -qa --queryformat '%{NAME}' > $@.tmp
|
rpm -qa --queryformat '%{NAME}\n' > $(SELECTION)
|
||||||
if diff $@ $@.tmp >/dev/null 2>&1; then mv $@.tmp $@; else rm -f $@.tmp; fi
|
touch $@
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf $(SELECTION) upload.done
|
rm -rf $(SELECTION) *.done *.tmp
|
||||||
|
|
||||||
upload.done: $(SELECTION)
|
upload.done: selection.done
|
||||||
sh $(UPLOAD_SH) $< $(UPLOAD_URL)
|
sh $(UPLOAD_SH) $< $(UPLOAD_URL)
|
||||||
ssh -l root ftp.jannet.de /etc/cron.hourly/create_packet_descriptions.sh
|
ssh -l root ftp.jannet.de /etc/cron.hourly/create_packet_descriptions.sh
|
||||||
touch $@
|
touch $@
|
||||||
|
|
@ -24,11 +24,11 @@ upload.done: $(SELECTION)
|
||||||
blah:
|
blah:
|
||||||
echo SUSE_RELEASE=$(SUSE_RELEASE)
|
echo SUSE_RELEASE=$(SUSE_RELEASE)
|
||||||
|
|
||||||
install-smart.done:
|
rpm-install-smart.done:
|
||||||
if ! rpm -q smarti >/dev/null 2>&1 ; then \
|
if ! rpm -q smart >/dev/null 2>&1 ; then \
|
||||||
wget ftp.jannet.de:/pub/packages/linux/suse/10.1/inst-source/rpm/i686/smart.rpm; \
|
wget ftp.jannet.de:/pub/packages/linux/suse/$(SUSE_RELEASE)/inst-source/rpm/i686/smart.rpm; \
|
||||||
sudo rpm -U smart.rpm; \
|
sudo rpm -U smart.rpm; \
|
||||||
fi
|
fi
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
install-smart: install-smart.done
|
install-smart: rpm-install-smart.done
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue