Skip to content

Commit

Permalink
os-release, lsb-release: Fix os-release diversion and drop obsolete l…
Browse files Browse the repository at this point in the history
…sb-release files

 * os-release: Divert /usr/lib/os-release instead of /etc/os-release in order
    to accommodate particularities in the lsb-release code of Debian.
    Normally, /etc/os-release should override /usr/lib/os-release, but the
    mentioned Debian code does not respect that unless extra environment
    variables are set.
  * /etc/lsb-release is not needed anymore on Buster and not used by lsb-release; drop it.
  * Document a harmless warning occurring at install time from dpkg-divert.
 * Bump package version.
  • Loading branch information
2ion committed Jul 27, 2019
1 parent 84d2f84 commit ef3431d
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 16 deletions.
4 changes: 4 additions & 0 deletions KNOWN_ISSUES.md
@@ -0,0 +1,4 @@
* dpkg-divert will complain `'dpkg-divert: warning: diverting file
'/usr/lib/os-release' from an Essential package with rename is dangerous, use
--no-rename'`. This is a bug or missing feature in the package
config-package-dev. It is harmless on Debian Buster.
4 changes: 2 additions & 2 deletions bunsen-os-release.5.mkd
Expand Up @@ -8,9 +8,9 @@ bunsen-os-release - Operating system and vendor identification

# SYNOPSIS

/etc/os/release
/etc/os-release (symlink)

/etc/lsb-release
/usr/lib/os-release

/etc/dpkg/origins/bunsenlabs

Expand Down
11 changes: 1 addition & 10 deletions config.mk
Expand Up @@ -32,16 +32,7 @@ endef
export OS_RELEASE_FILE
OS_RELEASE_FILE_TARGET = os-release.bunsen

define LSB_RELEASE_FILE
DISTRIB_ID="$(OS_PRETTY_ID)"
DISTRIB_DESCRIPTION="$(OS_LONGNAME)"
DISTRIB_RELEASE="$(OS_VERSION_ID)"
DISTRIB_CODENAME="$(call lc,$(OS_CODENAME))"
endef
export LSB_RELEASE_FILE
LSB_RELEASE_FILE_TARGET = lsb-release.bunsen

RELEASE_FILE_TARGETS = $(LSB_RELEASE_FILE_TARGET) $(OS_RELEASE_FILE_TARGET)
RELEASE_FILE_TARGETS = $(OS_RELEASE_FILE_TARGET)

#
# man page generator
Expand Down
3 changes: 1 addition & 2 deletions debian/bunsen-os-release.displace
@@ -1,3 +1,2 @@
/etc/os-release.bunsen
/etc/lsb-release.bunsen
/usr/lib/os-release.bunsen
/etc/dpkg/origins/default.bunsen
3 changes: 1 addition & 2 deletions debian/bunsen-os-release.install
@@ -1,4 +1,3 @@
os-release.bunsen etc/
lsb-release.bunsen etc/
os-release.bunsen usr/lib/
dpkg/origins/default.bunsen etc/dpkg/origins/
dpkg/origins/bunsenlabs etc/dpkg/origins/
11 changes: 11 additions & 0 deletions debian/changelog
@@ -1,3 +1,14 @@
bunsen-os-release (10.0.1-1) lithium; urgency=medium

* os-release: Divert /usr/lib/os-release instead of /etc/os-release in order
to accommodate particularities in the lsb-release code of Debian.
Normally, /etc/os-release should override /usr/lib/os-release, but the
mentioned Debian code does not respect that unless extra environment
variables are set.
* Document a harmless warning occurring at install time from dpkg-divert.

-- Jens John <dev@2ion.de> Thu, 31 Jan 2019 11:39:04 +0100

bunsen-os-release (10.0-1) lithium; urgency=medium

* Point release 10.0.
Expand Down

0 comments on commit ef3431d

Please sign in to comment.