Makefile: Repatriate the definition of packaging targets.
Prior to this change, the Makefile packaging targets were generated by a Python script, supposedly to reduce boilerplate. Make is able to programmatically define rules, so use its features instead. The packaging targets 'package-' prefix is dropped, making the targets names match the distribution directly, such as 'ubuntu_20.04'. The docker *-ro bind mounts are dropped; instead only the release tarball file name is exposed to the containers as *the* source, which makes it unambiguous as to which sources are used. The files related to RHEL builds are removed, as the RHEL build is known to be broken and isn't being used. * Makefile (DISTRIBUTIONS): New variable. (make-docker-package-target): New function. (docker/Dockerfile-snap): Adjust accordingly. docker/*: Standardize to use hyphens instead of a mix of hyphens and underscores. * docker/Dockerfile_rhel_8: Delete file. * docker/profile-seccomp-fedora_28.json: Delete file. * scripts/make-packaging-target.py: Delete file. * Jenkinsfile: Adjust accordingly. Change-Id: I2dc42b489a54b177ad038398a9d23a2a7e3007ec
Showing
- Jenkinsfile 4 additions, 7 deletionsJenkinsfile
- Makefile 82 additions, 11 deletionsMakefile
- docker/Dockerfile_rhel_8 0 additions, 85 deletionsdocker/Dockerfile_rhel_8
- docker/profile-seccomp-fedora_28.json 0 additions, 751 deletionsdocker/profile-seccomp-fedora_28.json
- scripts/build-package-debian.sh 3 additions, 2 deletionsscripts/build-package-debian.sh
- scripts/build-package-rpm.sh 7 additions, 4 deletionsscripts/build-package-rpm.sh
- scripts/build-package-snap.sh 1 addition, 1 deletionscripts/build-package-snap.sh
- scripts/make-packaging-target.py 0 additions, 262 deletionsscripts/make-packaging-target.py
Loading
Please register or sign in to comment