Compare commits

..

12 Commits

Author SHA1 Message Date
clrbuilder 0b86a75a10 Update packages file for version 33100
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2020-05-14 05:10:40 +00:00
clrbuilder a06eab078d Update packages file for version 33090
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2020-05-13 05:10:02 +00:00
clrbuilder d4ea9f57dc Update packages file for version 33060
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2020-05-08 05:09:10 +00:00
clrbuilder ee0847f750 Update packages file for version 33030
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2020-05-05 05:08:54 +00:00
clrbuilder 98047e4b8e Update packages file for version 33020
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2020-05-04 05:09:36 +00:00
clrbuilder aa98640939 Update packages file for version 33000
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2020-05-01 05:08:51 +00:00
clrbuilder 2b355f3fcb Update packages file for version 32990
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2020-04-30 05:09:01 +00:00
clrbuilder 57632934c0 Update packages file for version 32970
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2020-04-29 01:51:53 +00:00
clrbuilder a4b3da2bca Update packages file for version 32940
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2020-04-28 05:08:39 +00:00
clrbuilder f0f2ae6fdf Update packages file for version 32930
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2020-04-27 05:08:24 +00:00
clrbuilder 9d82331cfa Update packages file for version 32910
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2020-04-23 18:18:29 +00:00
Patrick McCarty ea568f6239 Support cloning of pre-existing package repos
Over the lifetime of Clear Linux OS, many packages have been added and
removed, but the package *repos* always remain once they have been
created.

Thus, if a package is removed at one point, and later added back to the
distro, the same package repo should be used. This commit adds support
to `make autospecnew` for that use case, always using a pre-existing
package repo if one is available.

(Note that the gitolite repo detection is more complicated because it
must support configurations with and without "wild repos" enabled.)

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2020-04-22 10:45:34 -07:00
3 changed files with 151 additions and 9 deletions
+32
View File
@@ -62,6 +62,38 @@ define remotepkgname
$(if $(USE_PACKAGE_MAPPING),$$(awk -v P="$(1)" '$$1 == P { res=$$2 } END { print res ? res : P }' $(TOPLVL)/projects/common/pkg-mapping),$(1))
endef
# Clone repo from the configured gitolite instance, but only if the repo exists
# on that instance and matches the pattern "packages/..*".
define try-clone-gitolite
rpkg=$(call remotepkgname,$(1)); \
if ssh $(GITOLITE_BASE_URL) info "packages/$$rpkg" | grep --quiet "packages/$$rpkg$$"; then \
git clone $(PKG_BASE_URL)/$$rpkg packages/$(1); \
cd packages/$(1); \
$(call gitoliteurl,packages/$(1)); \
$(call subjectprefix,$(1)); \
fi
endef
# Clone repo from the configured package repo hosting location, as defined by
# the PKG_BASE_URL variable, but only if the repo exists.
define try-clone-other
rpkg=$(call remotepkgname,$(1)); \
if git ls-remote $(PKG_BASE_URL)/$$rpkg &> /dev/null; then \
git clone $(PKG_BASE_URL)/$$rpkg packages/$(1); \
cd packages/$(1); \
$(call subjectprefix,$(1)); \
fi
endef
# First, try running `make clone_PKG`, where PKG is the first argument. If that
# fails, proceed with fallback cloning strategies.
define clone-if-available
$(MAKE) clone_$(1) || { \
$(if $(GITOLITE_BASE_URL),$(call try-clone-gitolite,$(1)),$(call try-clone-other,$(1))); \
}
endef
# Enables the local RPM repo by installing package manager and Mock configs.
# First argument is the path to the package manager config, and the second
# argument is the path to the mock config. Each of these config files is
+1 -1
View File
@@ -205,7 +205,7 @@ autospecnew: preautospecnew-checks localreponotice
echo "Please specify NAME and URL. The ARCHIVES variable is optional."; \
exit 1; \
fi
-$(MAKE) clone_$(NAME)
$(call clone-if-available,$(NAME))
@if [ ! -d $(TOPLVL)/packages/$(NAME)/.git ]; then \
echo "no remote repository found, creating new package repository and running autospec"; \
mkdir -p $(TOPLVL)/packages/$(NAME); \
+118 -8
View File
@@ -34,6 +34,7 @@ Judy
Keras
Keras_Applications
Keras_Preprocessing
LPCNet
LS_COLORS
LVM2
LibRaw
@@ -876,7 +877,6 @@ R-tis
R-tm
R-toOrdinal
R-topicmodels
R-treatSens
R-tree
R-triebeard
R-trimcluster
@@ -1037,6 +1037,7 @@ alembic
alsa-firmware
alsa-lib
alsa-plugins
alsa-tools
alsa-ucm-conf
alsa-utils
amazon-efs-utils
@@ -1045,12 +1046,14 @@ amtk
analitza
aniso8601
ansible
antlr4-python3-runtime
anyjson
apache-ant
apache-libcloud
apipkg
appdirs
applaunchservices
applicationinsights
appstream
appstream-glib
apr
@@ -1115,11 +1118,94 @@ avahi
awesome-wm
awscli
axel
azure-batch
azure-cli
azure-cli-command-modules-nspkg
azure-cli-core
azure-cli-nspkg
azure-cli-telemetry
azure-common
azure-configs
azure-core
azure-cosmos
azure-datalake-store
azure-functions-devops-build
azure-graphrbac
azure-iot-sdk
azure-keyvault
azure-keyvault-certificates
azure-keyvault-keys
azure-keyvault-secrets
azure-loganalytics
azure-mgmt-advisor
azure-mgmt-apimanagement
azure-mgmt-appconfiguration
azure-mgmt-applicationinsights
azure-mgmt-authorization
azure-mgmt-batch
azure-mgmt-batchai
azure-mgmt-billing
azure-mgmt-botservice
azure-mgmt-cdn
azure-mgmt-cognitiveservices
azure-mgmt-compute
azure-mgmt-consumption
azure-mgmt-containerinstance
azure-mgmt-containerregistry
azure-mgmt-containerservice
azure-mgmt-core
azure-mgmt-cosmosdb
azure-mgmt-datalake-analytics
azure-mgmt-datalake-nspkg
azure-mgmt-datalake-store
azure-mgmt-datamigration
azure-mgmt-deploymentmanager
azure-mgmt-devtestlabs
azure-mgmt-dns
azure-mgmt-eventgrid
azure-mgmt-eventhub
azure-mgmt-hdinsight
azure-mgmt-imagebuilder
azure-mgmt-iotcentral
azure-mgmt-iothub
azure-mgmt-iothubprovisioningservices
azure-mgmt-keyvault
azure-mgmt-kusto
azure-mgmt-loganalytics
azure-mgmt-managedservices
azure-mgmt-managementgroups
azure-mgmt-maps
azure-mgmt-marketplaceordering
azure-mgmt-media
azure-mgmt-monitor
azure-mgmt-msi
azure-mgmt-netapp
azure-mgmt-network
azure-mgmt-nspkg
azure-mgmt-policyinsights
azure-mgmt-privatedns
azure-mgmt-rdbms
azure-mgmt-recoveryservices
azure-mgmt-recoveryservicesbackup
azure-mgmt-redhatopenshift
azure-mgmt-redis
azure-mgmt-relay
azure-mgmt-reservations
azure-mgmt-resource
azure-mgmt-search
azure-mgmt-security
azure-mgmt-servicebus
azure-mgmt-servicefabric
azure-mgmt-signalr
azure-mgmt-sql
azure-mgmt-sqlvirtualmachine
azure-mgmt-storage
azure-mgmt-trafficmanager
azure-mgmt-web
azure-multiapi-storage
azure-nspkg
azure-servicebus
azure-storage-blob
azure-storage-common
babeltrace
babl
@@ -1205,7 +1291,6 @@ buildreq-nginx
buildreq-php
buildreq-qmake
buildreq-scons
bundle-chroot-builder
bwidget
byobu
bz2file
@@ -1368,7 +1453,7 @@ compat-ilmbase-soname23
compat-intel-gmmlib-soname1
compat-ipset-soname10
compat-iptables-soname0.1.0
compat-ldc-soname85
compat-ldc-soname90
compat-libevent-soname6
compat-libgit2-soname27
compat-libical-soname2
@@ -1383,6 +1468,7 @@ compat-llvm-soname6
compat-mariadb-soname18
compat-mpfr-soname4
compat-nettle-soname6
compat-nettle-soname7
compat-opencv-soname41
compat-proj-soname13
compat-protobuf-soname14
@@ -1423,7 +1509,6 @@ cpuloadgen
cracklib
crcmod
createrepo_c
cri-containerd
cri-o
cri-tools
cronie
@@ -1579,6 +1664,7 @@ envs
eog
eog-plugins
epm
epson-inkjet-printer-escpr
eternalegypt
ethtool
etr
@@ -1602,6 +1688,7 @@ extras
f2fs-tools
faas-cli
faba-icon-theme
fabric
fakeroot
fangfrisch
fann
@@ -1642,6 +1729,7 @@ flake8-import-order
flake8-polyfill
flare-engine
flare-game
flask-restx
flatpak
flatpak-builder
flatten_json
@@ -1688,6 +1776,7 @@ gcab
gcc
gcc7
gcc8
gcc9
gcompris-qt
gcr
gcs-oauth2-boto-plugin
@@ -1969,12 +2058,12 @@ intel-media-driver
intelhex
intervaltree
intltool
invoke
ioc-cbc-tools
ioping
ioport
iotop
ipaddr
ipaddress
ipcalc
ipdb
ipdbplugin
@@ -2019,6 +2108,7 @@ jaraco.collections
jaraco.functools
jaraco.text
jarn.viewdoc
javaproperties
jdcal
jedi
jedi-vim
@@ -2030,6 +2120,7 @@ joe
josepy
jpegoptim
jq
jsmin
json-c
json-glib
json5
@@ -2129,6 +2220,7 @@ kdiamond
kdiff3
kdnssd
kdoctools
kdsoap
keditbookmarks
keepalived
keepassxc
@@ -2209,6 +2301,7 @@ kmod
kmousetool
kmouth
kmplot
knack
knavalbattle
knetwalk
knewstuff
@@ -2477,6 +2570,7 @@ libnfnetlink
libnftnl
libnice
libnl
libnma
libnotify
libnova
libnumbertext
@@ -2742,6 +2836,8 @@ mock
mod_perl
mod_wsgi
modemmanager-qt
modsecurity
modsecurity-nginx
modules
moka-icon-theme
mokutil
@@ -2767,6 +2863,8 @@ mpir
mpmath
mpv
mraa
msal
msal-extensions
msgpack
msgpack-c
msm
@@ -2927,6 +3025,7 @@ openjade
openjdk
openjdk11
openjdk13
openjpeg
openldap
openmpi
openscad
@@ -3155,6 +3254,7 @@ perl-Clone-PP
perl-Compress-Bzip2
perl-Compress-Raw-Lzma
perl-Config-Any
perl-Config-AutoConf
perl-Config-General
perl-Config-Grammar
perl-Config-INI
@@ -3483,6 +3583,7 @@ perl-Math-Utils
perl-Math-Vec
perl-Memoize-ExpireLRU
perl-Meta-Builder
perl-Metrics-Any
perl-Minion
perl-Mixin-Linewise
perl-Mock-Config
@@ -3710,6 +3811,7 @@ perl-Test-LectroTest
perl-Test-LongString
perl-Test-Manifest
perl-Test-Memory-Cycle
perl-Test-Metrics-Any
perl-Test-MockModule
perl-Test-MockTime
perl-Test-More-UTF8
@@ -3978,6 +4080,7 @@ polkit-qt
poppler
poppler-data-clr-rename
popt
portalocker
portaudio
portend
positional
@@ -3991,6 +4094,7 @@ potrace
povray
powerdevil
powerline-fonts
powerstat
powertop
poxml
ppp
@@ -4179,6 +4283,7 @@ qpdf
qqc2-desktop-style
qrencode
qscintilla
qsstv
qt-creator
qt3d
qt5ct
@@ -4311,7 +4416,6 @@ sassc
satyr
sbc
sbsigntools
scala
scdoc
scene-alembic
scikit-build
@@ -4320,6 +4424,7 @@ scikit-learn
scipy
scons
scowl
scp
screen
scripttest
scrypt
@@ -4422,6 +4527,7 @@ squashfs-tools
squid
sshfs
sshpass
sshtunnel
ssocr
sssd
ssw
@@ -4463,7 +4569,6 @@ sweeper
swift
swig
swupd-client
swupd-client-pre-release
swupd-overdue
swupd-probe
swupd-search
@@ -4519,6 +4624,7 @@ terminus-font
tesseract
test-generator
testdisk
testfixtures
testpath
testrepository
testresources
@@ -4580,8 +4686,8 @@ trollius
trustme
twine
typed_ast
typing
typing_extensions
typing_inspect
tzdata
tzlocal
ua-parser
@@ -4649,6 +4755,8 @@ voluptuous-serialize
vpnc
vpp
vsqlite
vsts
vsts-cd-manager
vte
waffle
waitress
@@ -4730,6 +4838,8 @@ xfce4-appfinder
xfce4-dev-tools
xfce4-notifyd
xfce4-panel
xfce4-pulseaudio-plugin
xfce4-screensaver
xfce4-screenshooter
xfce4-session
xfce4-settings