Compare commits

..

5 Commits

Author SHA1 Message Date
clrbuilder d5cdd5d1c5 Update packages file for version 24700
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-08-28 12:02:54 +00:00
Patrick McCarty 806a1f5593 Fix several commands to use PKGS_LOCAL
Several commands should be using PKGS_LOCAL, which is the list of all
package repos that are present on the system, since the user might not
have all repos from PKGS cloned.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2018-08-27 14:40:57 -07:00
Patrick McCarty b82d61d686 clean/proper: honor toplevel --jobs value
This fixes integration with the GNU Make jobserver such that the
-j/--jobs value passed to make is actually honored.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2018-08-27 14:28:58 -07:00
clrbuilder d7404ca99d Update packages file for version 24690
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-08-27 21:02:15 +00:00
clrbuilder c81774a23c Update packages file for version 24680
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-08-27 12:02:27 +00:00
2 changed files with 19 additions and 12 deletions
+12 -12
View File
@@ -136,11 +136,11 @@ clean-pkgs-dir: $(PACKAGES_FILE)
done
@echo "packages directory cleaned";
clean_PKGS = $(addprefix clean_,$(PKGS))
clean_PKGS = $(addprefix clean_,$(PKGS_LOCAL))
#help clean: Run 'make clean' for every package.
clean: $(clean_PKGS)
proper_PKGS = $(addprefix proper_,$(PKGS))
proper_PKGS = $(addprefix proper_,$(PKGS_LOCAL))
#help proper: Run 'make proper' for every package, and purge the local
#help repo and image.
proper: $(proper_PKGS)
@@ -154,34 +154,34 @@ proper: $(proper_PKGS)
$(clean_PKGS):
@echo "cleaning $(patsubst clean_%,%,$@)"
-@$(MAKE) -s -j -C $(addprefix packages/,$(patsubst clean_%,%,$@)) clean
-@$(MAKE) -s -C $(addprefix packages/,$(patsubst clean_%,%,$@)) clean
$(proper_PKGS):
-@$(MAKE) -s -j -C $(addprefix packages/,$(patsubst proper_%,%,$@)) proper
-@$(MAKE) -s -C $(addprefix packages/,$(patsubst proper_%,%,$@)) proper
#help status: Runs git status for all package repos, thus displaying untracked
#help and unstaged files in addition to staged files.
status: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS))
@for p in projects/common $(addprefix packages/,$(PKGS)); do \
status: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
@for p in projects/common $(addprefix packages/,$(PKGS_LOCAL)); do \
if [ -d "$$p/.git" ] && [ -n "$$(git -C $$p status -uno --porcelain)" ]; then echo "Uncommitted changes in $$p:"; git -C "$$p" status --short; fi ;\
done
#help diff: Runs git diff for all package repos and displays the output using
#help diffstat. Requires that diffstat is installed.
diff: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS))
@for p in projects/common $(addprefix packages/,$(PKGS)); do \
diff: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
@for p in projects/common $(addprefix packages/,$(PKGS_LOCAL)); do \
(cd $$p ; git status | grep -q 'nothing to commit, working [^ ]* clean' || (echo "Uncommitted changes in: $$p"; git diff |diffstat -p1)) ;\
done
#help versions: Displays the version of each package in the ./packages tree.
versions: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS))
@for p in $(addprefix packages/,$(PKGS)); do \
versions: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
@for p in $(addprefix packages/,$(PKGS_LOCAL)); do \
(cd $$p; if ls *.spec &> /dev/null; then rpmspec -q --queryformat '%{NAME}-%{VERSION}\n' *.spec | head -n1; fi) ;\
done
#help releases: Like 'make versions', but also displays the release number.
releases: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS))
@for p in $(addprefix packages/,$(PKGS)); do \
releases: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
@for p in $(addprefix packages/,$(PKGS_LOCAL)); do \
(cd $$p; if ls *.spec &> /dev/null; then rpmspec -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}\n' *.spec | head -n1; fi) ;\
done
+7
View File
@@ -1223,6 +1223,7 @@ eog-plugins
epm
ethtool
eventlet
eventviews
evince
evolution
evolution-data-server
@@ -1690,6 +1691,7 @@ klines
kmag
kmahjongg
kmail
kmail-account-wizard
kmailtransport
kmbox
kmediaplayer
@@ -1747,6 +1749,8 @@ ktexteditor
ktextwidgets
ktimer
ktnef
ktp-approver
ktp-common-internals
ktp-desktop-applets
ktuberling
kturtle
@@ -2246,6 +2250,7 @@ oslosphinx
oslotest
osprofiler
ostree
otp
ovirt-guest-agent
ovs
ovsdbapp
@@ -3031,6 +3036,7 @@ pyzmq
qca-qt5
qemu
qemu-lite
qml-box2d
qpdf
qpid-python
qqc2-desktop-style
@@ -3390,6 +3396,7 @@ xcursor-themes
xcursorgen
xdg-desktop-portal
xdg-desktop-portal-gtk
xdg-desktop-portal-kde
xdg-user-dirs
xdg-user-dirs-gtk
xdg-utils