mirror of
https://github.com/clearlinux/common.git
synced 2026-06-16 11:06:15 +00:00
Compare commits
22 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9892e87aec | |||
| 100ad5965e | |||
| 61db58c057 | |||
| abe044ee0c | |||
| 8997c889f8 | |||
| f2dd86b50c | |||
| fa6fa080d6 | |||
| a20775675d | |||
| 9dfe2ba937 | |||
| 744cf78eb1 | |||
| 97e7ab937a | |||
| 4fb96cadcc | |||
| 670a01fc25 | |||
| 728e6ea221 | |||
| 240653c41d | |||
| 6935953ee7 | |||
| f210130e38 | |||
| 8df7f9dd6b | |||
| c424e9cd89 | |||
| c247096be4 | |||
| 42e2edaf6b | |||
| 5c4004f6d8 |
+9
-2
@@ -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
|
||||
@@ -192,10 +193,16 @@ autospecnew:
|
||||
echo "Please specify NAME and URL. The ARCHIVES variable is optional."; \
|
||||
exit 1; \
|
||||
fi
|
||||
@git clone $(PKG_BASE_URL)/$(NAME) $(TOPLVL)/packages/$(NAME) &> /dev/null || true
|
||||
@if [ ! -d $(TOPLVL)/packages/$(NAME)/.git ]; then \
|
||||
echo "no remote repository found, creating new package repository and running autospec"; \
|
||||
mkdir -p $(TOPLVL)/packages/$(NAME); \
|
||||
( \
|
||||
cd $(TOPLVL)/packages/$(NAME); \
|
||||
git init; \
|
||||
git remote add origin $(PKG_BASE_URL)/$(NAME); \
|
||||
$(call gitoliteurl,packages/$(NAME)); \
|
||||
$(call subjectprefix,$(NAME)); \
|
||||
); \
|
||||
printf 'PKG_NAME := %s\nURL = %s\nARCHIVES = %s\n\ninclude ../common/Makefile.common\n' $(NAME) '$(value URL)' '$(value ARCHIVES)' > $(TOPLVL)/packages/$(NAME)/Makefile; \
|
||||
python3 $(TOPLVL)/projects/autospec/autospec/autospec.py --integrity -t packages/$(NAME) --config $(AUTOSPEC_CONF) $(URL) --name $(NAME); \
|
||||
$(TOPLVL)/projects/common/checkblacklist.sh $(TOPLVL)/projects/common/blacklist $(TOPLVL)/packages/${NAME}/results/*.rpm; \
|
||||
|
||||
@@ -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'] = """
|
||||
|
||||
@@ -9,6 +9,7 @@ Jinja2
|
||||
Keras
|
||||
LS_COLORS
|
||||
LVM2
|
||||
LibRaw
|
||||
LibVNCServer
|
||||
Linux-PAM
|
||||
LuaJIT
|
||||
@@ -24,7 +25,6 @@ OpenSP
|
||||
Paste
|
||||
PasteDeploy
|
||||
Pillow
|
||||
PyQt5
|
||||
PyWavelets
|
||||
PyYAML
|
||||
Pygments
|
||||
@@ -162,6 +162,7 @@ SDL_mixer
|
||||
SDL_net
|
||||
SDL_ttf
|
||||
SQLAlchemy
|
||||
Send2Trash
|
||||
SocksiPy-branch
|
||||
Sphinx
|
||||
SuiteSparse
|
||||
@@ -227,6 +228,7 @@ autogen
|
||||
automake
|
||||
awscli
|
||||
azure-configs
|
||||
babeltrace
|
||||
babl
|
||||
backports.functools_lru_cache
|
||||
backports.ssl_match_hostname
|
||||
@@ -253,6 +255,7 @@ bluez
|
||||
bndl-lamp-basic
|
||||
bokeh
|
||||
boost
|
||||
borgbackup
|
||||
boto
|
||||
boto3
|
||||
botocore
|
||||
@@ -267,6 +270,7 @@ c_rehash
|
||||
ca-certs
|
||||
ca-certs-static
|
||||
cabextract
|
||||
cached-property
|
||||
cairo
|
||||
cairomm
|
||||
cargo
|
||||
@@ -286,8 +290,10 @@ chardet
|
||||
check
|
||||
cheese
|
||||
chrome-gnome-shell
|
||||
chrony
|
||||
chrpath
|
||||
cifs-utils
|
||||
clamav
|
||||
clear-config-management
|
||||
clear-containers-agent
|
||||
clear-containers-image
|
||||
@@ -330,7 +336,7 @@ comedilib
|
||||
compat-SDL2-soname1
|
||||
compat-efivar-soname0
|
||||
compat-fuse-soname2
|
||||
compat-gc-soname1
|
||||
compat-gegl
|
||||
compat-glew-soname1
|
||||
compat-guile-soname20
|
||||
compat-libical-soname2
|
||||
@@ -386,6 +392,7 @@ dbus-glib
|
||||
dconf
|
||||
deap
|
||||
decorator
|
||||
defusedxml
|
||||
dejagnu
|
||||
desktop-file-utils
|
||||
dfc
|
||||
@@ -421,6 +428,7 @@ ecdsa
|
||||
ed
|
||||
edk2
|
||||
efibootmgr
|
||||
efitools
|
||||
efivar
|
||||
eigen
|
||||
elasticsearch
|
||||
@@ -449,6 +457,7 @@ extras
|
||||
faba-icon-theme
|
||||
fann
|
||||
farstream
|
||||
fasteners
|
||||
fcgi
|
||||
fftw
|
||||
file
|
||||
@@ -504,6 +513,7 @@ geoclue
|
||||
geocode-glib
|
||||
gettext
|
||||
gevent
|
||||
gexiv2
|
||||
gflags
|
||||
ghostscript
|
||||
gimp
|
||||
@@ -662,11 +672,12 @@ irssi
|
||||
isa-l
|
||||
iso-codes
|
||||
iso8601
|
||||
isodate
|
||||
isort
|
||||
ister
|
||||
itstool
|
||||
iw
|
||||
javapackages-tools
|
||||
ixpdimm_sw
|
||||
jedi
|
||||
jedi-vim
|
||||
jemalloc
|
||||
@@ -849,8 +860,10 @@ libxkbcommon
|
||||
libxkbfile
|
||||
libxklavier
|
||||
libxml2
|
||||
libxml2-legacy
|
||||
libxshmfence
|
||||
libxslt
|
||||
libyami
|
||||
libzip
|
||||
linecache2
|
||||
links
|
||||
@@ -865,6 +878,7 @@ linux-hyperv-mini
|
||||
linux-kvm
|
||||
linux-libc-headers
|
||||
linux-lts
|
||||
linux-pk414
|
||||
linux-steam-integration
|
||||
linux-tools
|
||||
llvm
|
||||
@@ -909,6 +923,7 @@ mistune
|
||||
mixer-tools
|
||||
mkfontdir
|
||||
mkfontscale
|
||||
mkosi
|
||||
mock
|
||||
mod_wsgi
|
||||
moka-icon-theme
|
||||
@@ -920,6 +935,7 @@ mozjs38
|
||||
mpc
|
||||
mpfr
|
||||
mpg123
|
||||
msgpack-python
|
||||
msmtp
|
||||
msr-tools
|
||||
mstflint
|
||||
@@ -937,10 +953,12 @@ nasm
|
||||
nautilus
|
||||
nbconvert
|
||||
nbformat
|
||||
nbsphinx
|
||||
ncurses
|
||||
ncurses-compat
|
||||
ndctl
|
||||
ndg_httpsclient
|
||||
neofetch
|
||||
neon
|
||||
net-snmp
|
||||
net-tools
|
||||
@@ -995,6 +1013,7 @@ openconnect
|
||||
opencv
|
||||
openjade
|
||||
openjdk
|
||||
openjdk9
|
||||
openldap
|
||||
openmpi
|
||||
opensm
|
||||
@@ -1007,6 +1026,7 @@ opusfile
|
||||
orc
|
||||
ordereddict
|
||||
ostree
|
||||
ovirt-guest-agent
|
||||
p11-kit
|
||||
p7zip
|
||||
packaging
|
||||
@@ -1056,6 +1076,7 @@ perl-Eval-Closure
|
||||
perl-Exception-Class
|
||||
perl-Exporter-Tiny
|
||||
perl-File-Listing
|
||||
perl-File-Slurp
|
||||
perl-HTML-Parser
|
||||
perl-HTML-Tagset
|
||||
perl-HTTP-Cookies
|
||||
@@ -1170,11 +1191,11 @@ ptyprocess
|
||||
pugixml
|
||||
pulseaudio
|
||||
py
|
||||
py2cairo
|
||||
pyOpenSSL
|
||||
pyaml
|
||||
pyasn1
|
||||
pyasn1-modules
|
||||
pycairo
|
||||
pycodestyle
|
||||
pycparser
|
||||
pycrypto
|
||||
@@ -1189,7 +1210,6 @@ pylint
|
||||
pynacl
|
||||
pypandoc
|
||||
pyparsing
|
||||
pypy
|
||||
pyquery
|
||||
pyrfc3339
|
||||
pyserial
|
||||
@@ -1219,6 +1239,7 @@ python-systemd
|
||||
python-tappy
|
||||
python-toml
|
||||
python-urwid
|
||||
python-zeep
|
||||
python3
|
||||
pytz
|
||||
pyudev
|
||||
@@ -1228,8 +1249,33 @@ pyzmq
|
||||
qemu
|
||||
qemu-lite
|
||||
qpdf
|
||||
qt-everywhere-opensource-src
|
||||
qt3d
|
||||
qtbase
|
||||
qtcanvas3d
|
||||
qtcharts
|
||||
qtconnectivity
|
||||
qtconsole
|
||||
qtdeclarative
|
||||
qtgraphicaleffects
|
||||
qtimageformats
|
||||
qtlocation
|
||||
qtmultimedia
|
||||
qtquickcontrols
|
||||
qtquickcontrols2
|
||||
qtremoteobjects
|
||||
qtscript
|
||||
qtscxml
|
||||
qtsensors
|
||||
qtserialbus
|
||||
qtserialport
|
||||
qtsvg
|
||||
qttools
|
||||
qttranslations
|
||||
qtvirtualkeyboard
|
||||
qtwebchannel
|
||||
qtwebsockets
|
||||
qtx11extras
|
||||
qtxmlpatterns
|
||||
quagga
|
||||
quilt
|
||||
randrproto
|
||||
@@ -1303,13 +1349,13 @@ sox
|
||||
spark-dep
|
||||
speex
|
||||
speexdsp
|
||||
sphinx_rtd_theme
|
||||
sphinxcontrib-newsfeed
|
||||
sphinxcontrib-websupport
|
||||
spi-tools
|
||||
spice
|
||||
spice-gtk
|
||||
spice-protocol
|
||||
spyder
|
||||
spyder-notebook
|
||||
sqlite-autoconf
|
||||
sqlparse
|
||||
@@ -1366,6 +1412,7 @@ tiptop
|
||||
tk
|
||||
tmux
|
||||
tokyocabinet
|
||||
toolbelt
|
||||
tornado
|
||||
totem
|
||||
totem-pl-parser
|
||||
@@ -1438,7 +1485,9 @@ xauth
|
||||
xbitmaps
|
||||
xcb-proto
|
||||
xcb-util
|
||||
xcb-util-image
|
||||
xcb-util-keysyms
|
||||
xcb-util-wm
|
||||
xclip
|
||||
xcmiscproto
|
||||
xcursor-themes
|
||||
|
||||
Reference in New Issue
Block a user