Commit Graph

21 Commits

Author SHA1 Message Date
Peter A. Bigot c33bf220de chkconfig: remove linuxstdbase symlinks
These links were moved to the lsb package because lsbsetup was to be
removed.  Subsequently an earlier patch that moved them to chkconfig was
also merged.  This results in duplicate installations that generate a
warning when building core-image-lsb under DISTRO=poky-lsb which enables the
linuxstdbase feature.

(From OE-Core rev: 77a0b904e18688ecf81a35544f3a5d6ba0aa61a8)

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-09-06 23:03:23 +01:00
Wenzong Fan e486242db8 chkconfig: fix QA warning about unsafe references in binaries
This test is disabled in oe-core by default, but if we enable it, we'll
get following warnings:

  + WARN_QA = "unsafe-references-in-binaries unsafe-references-in-scripts"

WARNING: QA Issue: chkconfig: /sbin/chkconfig, installed in the \
base_prefix, requires a shared library under exec_prefix (/usr): \
libpopt.so.0 => /usr/lib64/libpopt.so.0

(From OE-Core rev: 18f5e6b80e1465e00242a2513a4bd90e0a2f3ff7)

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-06-11 15:38:01 +01:00
Martin Jansa 08385ae5b2 chkconfig-alternatives-native: just append to PROVIDES
(From OE-Core rev: f0c600ce8971c5444198ffe4f596b671e3e668cf)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-02 22:45:26 +00:00
Christopher Larson 35f0d0a84a chkconfig-alternatives-native-1.3.59: add recipe
This only builds alternatives, so avoids the libnewt and libpopt dependencies.

This uses 1.3.59 sources from git, with a couple commits of mine to add
--sysroot (and OPKG_OFFLINE_ROOT) support.

LIC_FILES_CHKSUM changed from 1.3.58 to 1.3.59, but only due to minor
formatting differences, not content/terms.

(From OE-Core rev: 7895540e02a563c107934572fdbf23fdf1661c91)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-07 11:09:42 +00:00
Christopher Larson eb91689e33 chkconfig: package the update-alternatives implementation
(From OE-Core rev: c18b1ce2d98460e5ee6ec6319071bc1fa1016ede)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-07 11:09:42 +00:00
Christopher Larson 6c7ab511ca chkconfig: obey sysconfdir, base_libdir
(From OE-Core rev: afd9f47080b36d609297e2eb448bc12af8000d29)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-07 11:09:41 +00:00
Christopher Larson a045d23345 chkconfig: don't inherit autotools
This buildsystem is not autoconf/automake, but make.

While we're at it, also make the install not hardcode the path to
/usr/share/locale.

(From OE-Core rev: 0e6f76d9d5929f8c23916827dccc8389419f0163)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-07 11:09:41 +00:00
Kang Kai 5283be2305 chkconfig: add link files install_initd and remove_initd
Add link files ${libdir}/lsb/{install,remove}_initd that they are
required by LSB tests. They were created by package lsbsetup, but
lsbsetup was dropped, so create them in chkconfig.

(From OE-Core rev: 268ede582e7b68854965b29a57e865b5fc7deb04)

Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-06 12:31:02 +00:00
Joe Slater 7087e82079 chkconfig: pass CFLAGS to Makefile
The environment CFLAGS is not used by the chkconfig
Makefile, so debug and optimization options are ignored.
So, we use RPM_OPT_FLAGS to pass CFLAGS into Makefile.

Upstream-Status:  Inappropriate [configuration]

(From OE-Core rev: ecdb24c21b7b90b83748cbe5891437b2183321d7)

Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-18 12:13:41 +01:00
Javier Martinez Canillas 05e00a93f4 chkconfig: use ${sysconfdir} instead of /etc for packaging
It is considered good practice to use the build system provided
variables instead of directly specify hardcoded paths.

(From OE-Core rev: 7b77d4372ace6aa2400e3328875b39b4f67476d0)

Signed-off-by: Javier Martinez Canillas <javier@dowhile0.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-06 15:18:50 +01:00
Richard Purdie 69db7852ae chkconfig: Fix unpackaged files warnings
WARNING: For recipe chkconfig, the following files/directories were installed but not shipped in any package:
WARNING:   /usr/man
WARNING:   /usr/man/man5
WARNING:   /usr/man/man8
WARNING:   /usr/man/man8/chkconfig.8
WARNING:   /usr/man/man8/update-alternatives.8
WARNING:   /usr/man/man8/ntsysv.8
WARNING:   /usr/man/man8/alternatives.8

(From OE-Core rev: 9b62f4509e92fc8a88b923a3a77f9f27d7184a0f)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-16 16:47:42 +00:00
Wenzong Fan f65d96ba2a chkconfig: update it from 1.3.57 to 1.3.58
Update chkconfig and related distro tracking fields.

(From OE-Core rev: 4cd85be17c7964ad24f1877f8b7181df0a0738fb)

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-14 13:17:44 +00:00
Andrei Gherzan 8a7a7fef73 chkconfig: Update package from v1.3.55 to v1.3.57
(From OE-Core rev: 28191449636ef2554e82459038a2d67915e9a022)

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-19 11:34:10 +00:00
Wenzong Fan 43f4f31ef0 chkconfig: Update to 1.3.55
Update chkconfig to 1.3.55 from 1.3.52.

(From OE-Core rev: a1d89422cc956e9bf08c1eac6a781ea1170e3860)

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-20 17:13:41 +01:00
Xiaofeng Yan e8ca7c9046 chkconfig: remove link for update-alternatives to disambiguate
[YOCTO #936]
"update-alternatives" installed: one in /usr/sbin from chkconfig \
(symlinked to "alternatives"), and the other in /usr/bin \
from update-alternatives-cworth.
It appears for whatever reason that the one from chkconfig is run \
during postinst processing but if you run the script from the command \
line it gets the other one.
this is due to differences in the PATH environment variable.

The following is the sequence to call scripts after kernel booting
inittab
  -->rcS
     -->./S40networking(PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin)
     -->S98configure(call rpm-postinstall)
        #"/usr/sbin" is found prior to "/usr/bin", so update-alternatives from chkconfig is run in this script
  -->rc5.d
  -->profile(profile:4:PATH="/usr/local/bin:/usr/bin:/bin" profile:15: PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin)
  #"/usr/bin/" is found prior to "/usr/sbin", so update-alternatives from update-alternatives-cworth is run in this script

So I remove the symlink (update-alternatives linked to chkconfig). The one from update-alternatives-cworth is left alone.

(From OE-Core rev: f3a52a73251b26ead15abd4910dc82c1011ab852)

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-11 19:22:06 +01:00
Yu Ke a242da91a2 SRC_URI, S: use BPN instead of PN for multilib case
in multilibcase, PN has multilib prefix, so it is not
correct to use PN in SRC_URI and S. instead,  we've
dedicately pruned multilib prefix in BPN, so BPN is
the right alternative for PN.

(From OE-Core rev: d6dca85028640034b1a5356920aad3268bd4f1c2)

Signed-off-by: Yu Ke <ke.y@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-04 15:04:30 +01:00
Saul Wold 18940c7497 chkconfig: update to 1.3.52
(From OE-Core rev: 4cf0e0f8fc7da0e052dd779927a10eaea4823e93)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-01 18:34:33 +01:00
Saul Wold 4344df2e25 chkconfig: Update to 1.3.51
(From OE-Core rev: 0343a5577e2d110dede8113a5a33fa452a55f2f6)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-08 06:14:58 -07:00
Khem Raj 6bcb66d2ed chkconfig_1.3.49.bb: inherit gettext class instead of adding gettext to DEPENDS directly
(From OE-Core rev: 55bd7994f6fa6c39ee0bf3401cf8c8afbe4f63b9)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-04 14:09:46 +01:00
Richard Purdie dabd5deb4e Fixup merge error and apply cleanups
(From OE-Core rev: a72822d315d7bc35a424b0807693ad7a3317c519)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-03 23:49:21 +00:00
Kang Kai b9c46b377c recipe: add chkconfig for LSB command test
chkconfig is a system tool for maintaining the /etc/rc*.d hierarchy,
and LSB command test will check 2 links point to command  chkconfig

(From OE-Core rev: 994cb5be07270b8414d46e01ed7888e2de448589)

Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-03 23:49:16 +00:00