Skip to content

Commit

Permalink
T6527: remove legacy Perl library components
Browse files Browse the repository at this point in the history
  • Loading branch information
c-po committed Jun 30, 2024
1 parent 6f435de commit 069bd35
Show file tree
Hide file tree
Showing 23 changed files with 3 additions and 3,545 deletions.
11 changes: 0 additions & 11 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
SUBDIRS = . perl_dmod

share_perl5dir = /opt/vyatta/share/perl5/Vyatta
completiondir = /etc/bash_completion.d
initddir = /etc/init.d
logrotatedir = /etc/logrotate.d
Expand Down Expand Up @@ -101,14 +98,6 @@ sbin_SCRIPTS += scripts/vyatta-log-commit.pl
sbin_SCRIPTS += scripts/vyos-user-precommit-hooks.sh
sbin_SCRIPTS += scripts/vyos-user-postcommit-hooks.sh

share_perl5_DATA = lib/Vyatta/Config.pm
share_perl5_DATA += lib/Vyatta/File.pm
share_perl5_DATA += lib/Vyatta/Misc.pm
share_perl5_DATA += lib/Vyatta/ioctl.pm
share_perl5_DATA += lib/Vyatta/Interface.pm
share_perl5_DATA += lib/Vyatta/TypeChecker.pm
share_perl5_DATA += lib/Vyatta/ConfigOutput.pm

default_DATA = etc/default/vyatta-cfg
default_DATA += etc/default/vyatta-load-boot

Expand Down
1 change: 0 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ AM_CONDITIONAL([USE_UNIONFSFUSE], [test "$enable_unionfsfuse" != no])

AC_CONFIG_FILES(
[Makefile]
[perl_dmod/Makefile]
[debian/vyatta-cfg.postinst])

AC_SUBST(NOSTRIP)
Expand Down
9 changes: 3 additions & 6 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Priority: extra
Maintainer: VyOS Package Maintainers <[email protected]>
Build-Depends: debhelper (>= 10), autotools-dev, libglib2.0-dev,
libboost-filesystem-dev, libapt-pkg-dev, libtool, flex,
bison, libperl-dev, autoconf, automake, pkg-config, cpio, dh-autoreconf
bison, autoconf, automake, pkg-config, cpio, dh-autoreconf
Standards-Version: 3.9.1

Package: vyatta-cfg
Expand All @@ -14,13 +14,12 @@ Depends: sed (>= 4.1.5),
coreutils (>= 5.97-5.3),
vyatta-bash | bash (>= 4.1),
bsdutils (>=1:2.13),
libsocket6-perl,
libvyatta-cfg1 (>=${binary:Version}),
unionfs-fuse,
uuid-runtime,
libboost-filesystem1.74.0,
libapt-pkg4.12 | libapt-pkg5.0 | libapt-pkg6.0,
${perl:Depends}, ${shlibs:Depends}
${shlibs:Depends}
Suggests: util-linux (>= 2.13-5),
net-tools,
ncurses-bin (>= 5.5-5),
Expand All @@ -30,9 +29,7 @@ Description: VyOS configuration system

Package: libvyatta-cfg1
Architecture: any
Depends: libsort-versions-perl,
libfile-sync-perl,
${perl:Depends}, ${shlibs:Depends}
Depends: ${shlibs:Depends}
Replaces: vyatta-cfg
Description: vyatta-cfg back-end library
Vyatta configuration back-end library (libvyatta-cfg).
Expand Down
1 change: 0 additions & 1 deletion debian/libvyatta-cfg1.install
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
usr/lib/*.so.*
opt/vyatta/share/perl5
4 changes: 0 additions & 4 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@ inst_opts := --sourcedir=debian/tmp
autoreconf:
autoreconf -f -i

override_dh_perl:
rm -f debian/files
dh_perl /opt/vyatta/share/perl5 /opt/vyatta/share/perl5/Vyatta

override_dh_gencontrol:
rm -f debian/*/DEBIAN/conffiles
if [ -f "../.VYOS_DEV_BUILD" ]; then \
Expand Down
Loading

0 comments on commit 069bd35

Please sign in to comment.