diff --git a/make/smart-selection.mk b/make/smart-selection.mk index 144c3dc6..f3990bf6 100644 --- a/make/smart-selection.mk +++ b/make/smart-selection.mk @@ -8,8 +8,8 @@ DISTRIBUTOR = $(shell $(GET_OS_SH) | cut -d- -f1) DISTRO_RELEASE = $(shell $(GET_OS_SH) | cut -d- -f2-) UPLOAD_URL = root@ftp.jannet.de:/home/ftp/dat/pub/packages/linux/$(DISTRIBUTOR)/$(DISTRO_RELEASE)/inst-source/setup/descr -SELECTION = $(shell sh $(GENERATE_SELECTION) -s)-packages.txt -CHANNEL_LIST = $(shell sh $(GENERATE_SELECTION) -s)-channels.txt +SELECTION = $(shell $(GENERATE_SELECTION) -s)-packages.txt +CHANNEL_LIST = $(shell $(GENERATE_SELECTION) -s)-channels.txt # === targets all: selection.done channels.done @@ -22,10 +22,11 @@ install-smart: rpm-install-smart.done commit: selection.done channels.done cvs add $(SELECTION) $(CHANNEL_LIST) cvs commit -m "o updated by target $@" +smart-update: smart-update.done # === rules selection.done: $(MODDIR)/make/smart-selection.mk - rpm -qa --queryformat '%{NAME}\n' | \ + rpm -qa --queryformat '%{NAME}\n' | sort -u | \ sed ' \ /gpg-pubkey/ d \ ' > $(SELECTION) @@ -50,13 +51,14 @@ rpm-install-smart.done: touch $@ smart-update.done: - smart update || exit 0 + sudo smart update || exit 0 touch $@ %-packages.txt-install: smart-update.done cat $*-packages.txt | xargs sudo smart install -y %-channels.txt-replace: smart-update.done - sudo smart channel --remove-all -y - sudo smart channel --add -y $*-channels.txt + sudo smart channel -y --remove-all + sudo smart channel -y --add $*-channels.txt + sudo smart update || exit 0