make clean: show what's going on

Intead of waiting forever, show the user the package we're cleaning. Signed-off-by: Leandro Dorileo <leandro.maciel.dorileo@intel.com>
give status target a better output
2026-06-16 11:06:15 +00:00 · 2018-02-12 18:49:24 -08:00 · 2018-02-12 18:49:21 -08:00 · 2018-02-12 11:46:31 -08:00 · 2018-02-08 16:53:40 -08:00 · 2018-02-06 13:23:41 -08:00
5 changed files with 33 additions and 7 deletions
@@ -148,6 +148,7 @@ proper: $(proper_PKGS)
 .PHONY: $(proper_PKGS)

 $(clean_PKGS):
+	@echo "cleaning $(patsubst clean_%,%,$@)"
 	-@$(MAKE) -s -j -C $(addprefix packages/,$(patsubst clean_%,%,$@)) clean

 $(proper_PKGS):
@@ -157,7 +158,7 @@ $(proper_PKGS):
 #help and unstaged files in addition to staged files.
 status: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS))
 	@for p in projects/common $(addprefix packages/,$(PKGS)); do \
-		(cd $$p ; git status | grep -q 'nothing to commit, working [^ ]* clean' || (echo "Uncommitted changes in $$p:"; git status)) ;\
+	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
@@ -20,8 +20,16 @@ building Clear Linux packages.
 ### Automated setup

 Download the [user setup](user-setup.sh) script and run it on your Clear Linux
-system as an unprivileged user. After the script completes, make sure to logout
-and login again to complete the setup process.
+system as an unprivileged user.
+
+```
+$ curl -O https://raw.githubusercontent.com/clearlinux/common/master/user-setup.sh
+$ chmod +x user-setup.sh
+$ ./user-setup.sh
+```
+
+After the script completes, make sure to logout and login again to complete the
+setup process.

 The script either accepts no options, or all (3) options in case you are
 configuring the Koji CLI for remote building on a Koji server. The options are
@@ -13,3 +13,11 @@

 # String to replace with "localhost" in upstream tarball URLs
 #urlban =
+
+# Path to packages file, a list of current packages in Clear Linux. It can be
+# an absolute path or a path relative to this autospec.conf.
+#packages_file =
+
+# Path to yum config, used for generating whatrequires. It can be an absolute
+# path or a path relative to this autospec.conf.
+#yum_conf =
@@ -4,8 +4,10 @@ config_opts['legal_host_arches'] = ('x86_64',)
 config_opts['chroot_setup_cmd'] = 'groupinstall build srpm-build'
 config_opts['dist'] = 'clear'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['useradd'] = '/usr/sbin/useradd -m -u %(uid)s -g %(gid)s -d %(home)s  %(user)s' 
+config_opts['useradd'] = '/usr/sbin/useradd -m -u %(uid)s -g %(gid)s -d %(home)s  %(user)s'
 config_opts['plugin_conf']['ccache_enable'] = False
+config_opts['releasever'] = 'clear'
+config_opts['package_manager'] = 'dnf'


 config_opts['yum.conf'] = """
@@ -162,6 +162,7 @@ SDL_mixer
 SDL_net
 SDL_ttf
 SQLAlchemy
+Send2Trash
 SocksiPy-branch
 Sphinx
 SuiteSparse
@@ -176,6 +177,7 @@ WebTest
 Werkzeug
 Whoosh
 abireport
+absl-py
 accountsservice
 acl
 acme
@@ -226,6 +228,7 @@ autogen
 automake
 awscli
 azure-configs
+babeltrace
 babl
 backports.functools_lru_cache
 backports.ssl_match_hostname
@@ -285,6 +288,7 @@ chardet
 check
 cheese
 chrome-gnome-shell
+chrony
 chrpath
 cifs-utils
 clear-config-management
@@ -329,7 +333,6 @@ comedilib
 compat-SDL2-soname1
 compat-efivar-soname0
 compat-fuse-soname2
-compat-gc-soname1
 compat-glew-soname1
 compat-guile-soname20
 compat-libical-soname2
@@ -448,6 +451,7 @@ extras
 faba-icon-theme
 fann
 farstream
+fasteners
 fcgi
 fftw
 file
@@ -848,6 +852,7 @@ libxkbcommon
 libxkbfile
 libxklavier
 libxml2
+libxml2-legacy
 libxshmfence
 libxslt
 libzip
@@ -864,6 +869,7 @@ linux-hyperv-mini
 linux-kvm
 linux-libc-headers
 linux-lts
+linux-pk414
 linux-steam-integration
 linux-tools
 llvm
@@ -908,6 +914,7 @@ mistune
 mixer-tools
 mkfontdir
 mkfontscale
+mkosi
 mock
 mod_wsgi
 moka-icon-theme
@@ -924,6 +931,7 @@ msr-tools
 mstflint
 mtdev
 multimon-ng
+multipath-tools
 murrine
 musl
 mutt
@@ -1168,11 +1176,11 @@ ptyprocess
 pugixml
 pulseaudio
 py
-py2cairo
 pyOpenSSL
 pyaml
 pyasn1
 pyasn1-modules
+pycairo
 pycodestyle
 pycparser
 pycrypto
@@ -1187,7 +1195,6 @@ pylint
 pynacl
 pypandoc
 pyparsing
-pypy
 pyquery
 pyrfc3339
 pyserial
Author	SHA1	Message	Date
Leandro Dorileo	728e6ea221	make clean: show what's going on Intead of waiting forever, show the user the package we're cleaning. Signed-off-by: Leandro Dorileo <leandro.maciel.dorileo@intel.com>	2018-02-12 18:49:24 -08:00
Leandro Dorileo	240653c41d	give status target a better output Improve the output for "make status" by displaying only relevant status parts (avoiding the git warning and instructions output). Also make sure we don't run git status "non git package folders" (i.e packages/common). Signed-off-by: Leandro Dorileo <leandro.maciel.dorileo@intel.com>	2018-02-12 18:49:21 -08:00
clrbuilder	6935953ee7	Update packages file for version 20760 Signed-off-by: clrbuilder <david.j.klimesh@intel.com>	2018-02-12 11:46:31 -08:00
clrbuilder	f210130e38	Update packages file for version 20730 Signed-off-by: clrbuilder <david.j.klimesh@intel.com>	2018-02-08 16:53:40 -08:00
Patrick McCarty	8df7f9dd6b	Update autospec.conf template Expand the autospec.conf template to document missing options. Also, autospec just gained the ability to understand relative paths for these two options, so document this too. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2018-02-06 13:23:41 -08:00
clrbuilder	c424e9cd89	Update packages file for version 20700 Signed-off-by: clrbuilder <david.j.klimesh@intel.com>	2018-02-06 05:45:22 -08:00
Patrick McCarty	c247096be4	Provide an example for running user-setup.sh The README was not very clear on how to actually download the script and run it, so provide an example. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2018-02-05 13:14:36 -08:00
clrbuilder	42e2edaf6b	Update packages file for version 20690 Signed-off-by: clrbuilder <david.j.klimesh@intel.com>	2018-02-05 09:37:54 -08:00
William Douglas	5c4004f6d8	Update mock clear.cfg to use dnf	2018-02-02 04:17:10 +00:00
clrbuilder	374f9dd581	Update packages file for version 20600 Signed-off-by: clrbuilder <david.j.klimesh@intel.com>	2018-01-30 06:00:59 -08:00
clrbuilder	68c06960c9	Update packages file for version 20580 Signed-off-by: clrbuilder <david.j.klimesh@intel.com>	2018-01-29 06:00:57 -08:00