Skip to content
This repository has been archived by the owner on May 7, 2024. It is now read-only.

Commit

Permalink
meta: drop unmaintained RPM support (revert to revive)
Browse files Browse the repository at this point in the history
  • Loading branch information
MingcongBai committed May 11, 2020
1 parent 1208397 commit 6be70b0
Show file tree
Hide file tree
Showing 12 changed files with 4 additions and 236 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ Autobuild3 is a successor to the original [Autobuild](https://github.com/AOSC-De

- DPKG, the most "native" backend of all, using `dpkg-deb` and Autobuild variables to control the generation of DPKG control files, and henceforth building the packages.
- The "native" part is largely caused by some autobuild2 heritage in our brains and in the build scripts, which ended up infecting many other parts of ab3. For example, the architecture names in `ABHOST` and `ABBUILD` are dpkg names, the PM dep model is based on dpkg representations, ...
- RPM, using Autobuild variables to generate .spec files, and invoking `rpmbuild` to build RPM packages.
- PKGBUILD (coming soon), using Autobuild variables to generate `PKGBUILD` files, using a temporary install root, to provide `makepkg` with a fake binary packaging process.

Installing autobuild3
Expand Down
14 changes: 0 additions & 14 deletions arch/_common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,6 @@ ARCH_TARGET['powerpc']=powerpc-aosc-linux-gnu
ARCH_TARGET['ppc64']=powerpc64-aosc-linux-gnu
ARCH_TARGET['ppc64el']=powerpc64le-aosc-linux-gnu
ARCH_TARGET['riscv64']=riscv64-aosc-linux-gnu
ARCH_RPM['amd64']=x86_64
ARCH_RPM['amd64/avx+']=x86_64
ARCH_RPM['amd64/avx2+']=x86_64
ARCH_RPM['arm64']=aarch64
ARCH_RPM['armhf']=armhfp
ARCH_RPM['armel']=armv5tel
ARCH_RPM['i486']=i486
ARCH_RPM['loongson2']=loongson2
ARCH_RPM['mips64r2el']=mips64r2el
ARCH_RPM['noarch']=noarch
ARCH_RPM['powerpc']=ppc
ARCH_RPM['ppc64']=ppc64
ARCH_RPM['ppc64el']=ppc64le
ARCH_RPM['riscv64']=riscv64
# C Compiler Flags.
CFLAGS_COMMON='-pipe -Wno-error '
CFLAGS_COMMON_OPTI='-O2 '
Expand Down
2 changes: 1 addition & 1 deletion autobuild/defines
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ PKGEPOCH=1
PKGVER=1.5.7$( ((_GIT)) && echo "+$(timestamp_convert $(git log -1 --date=raw --pretty=format:%cd))")
PKGDES="Automatic package building tool."
PKGRECOM="distcc ccache"
PKGDEP="dpkg bash rpm apt coreutils autoconf automake autogen spdx-licenses"
PKGDEP="dpkg bash apt coreutils autoconf automake autogen spdx-licenses"
PKGREP="autobuild"
PKGSEC=devel

Expand Down
2 changes: 1 addition & 1 deletion contrib/autobuild-aoscarchive
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
##@copyright GPL-2.0+
# THIS SCRIPT IS INTENDED FOR USE INSIDE AUTOBUILD, WITH EXPORTED VATIABLES, LIKE AB, ARCH.
# SYNTAX: autobuild abrepoarchive PKGNAME PKGVER PKGREL
# CURRENTLY DEFINED PKGMGRs: dpkg, rpm.
# CURRENTLY DEFINED PKGMGRs: dpkg.

# Directory Tree with priorities.
DIR_TREE="a b c d e f g h i j k m n o p q r s t u v w x y z
Expand Down
14 changes: 0 additions & 14 deletions contrib/autobuild-deb2rpm

This file was deleted.

2 changes: 1 addition & 1 deletion etc/autobuild/ab3_defcfg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ RECONF=yes

##Packaging info
ABQA=yes
ABINSTALL="dpkg rpm"
ABINSTALL="dpkg"

# Old, default.
[[ -d "$AB"/etc/autobuild/defaults ]] && recsr "$AB"/etc/autobuild/defaults/*!(.dpkg*|dist)
Expand Down
2 changes: 1 addition & 1 deletion lib/arch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ abrequire pm

# translations from dpkg representation to generic ones.
# Sorry, top level! Scoping made me do this.
declare -gA ARCH_RPM ARCH_TARGET
declare -gA ARCH_TARGET
ARCH_FINDFILELIST=("autobuild/$ABHOST"{-cross{-"$ABBUILD",},} autobuild)
ARCH_SUFFIX=('' .sh .bash .bsh)
arch_findfile(){
Expand Down
2 changes: 0 additions & 2 deletions lib/pm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,7 @@ pm_deflat(){ ABPM=dummy VER_NONE_ALL=1 VER_NONE=1 PM_ALT=0 PM_COMMA=' ' PM_DELIM
# dumpver: dumps a dpkg-ab-lish verstring.
pm_dumpver(){ ((PKGEPOCH)) && echo -n $PKGEPOCH:; echo -n $PKGVER; ((PKGREL)) && echo -n -$PKGREL; }

# Deprecate RPMEPOCH.
declare -gi PKGEPOCH
declare -gn RPMEPOCH=PKGEPOCH

. "$AB"/pm/"$ABMPM"/lib.sh
abtrycmd pm_{whoprov,getver,exists,repoupdate,repoinstall,chroot,getver,exists}
5 changes: 0 additions & 5 deletions pm/rpm/install

This file was deleted.

27 changes: 0 additions & 27 deletions pm/rpm/lib.sh

This file was deleted.

118 changes: 0 additions & 118 deletions pm/rpm/pack

This file was deleted.

51 changes: 0 additions & 51 deletions pm/rpm/rpm-sec

This file was deleted.

0 comments on commit 6be70b0

Please sign in to comment.