Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2026-02-12 13:03:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge build-status into ubuntu/master [a=utkarsh] [r=]

Browse Source 
Rename ISO_STATUS to BUILD_TYPE for image builds

MP: https://code.launchpad.net/~utkarsh/livecd-rootfs/+git/livecd-rootfs/+merge/500253

* build-status:
  Update d/ch for 26.04.16 release
  Rename ISO_STATUS to BUILD_TYPE for image builds
This commit is contained in:
Utkarsh Gupta 2026-02-12 01:53:18 +05:30
commit e26de340e2
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (26.04.16) resolute; urgency=medium
* Rename ISO_STATUS to BUILD_TYPE for image builds.
-- Utkarsh Gupta <utkarsh@debian.org> Thu, 12 Feb 2026 01:41:11 +0530
livecd-rootfs (26.04.15) resolute; urgency=medium livecd-rootfs (26.04.15) resolute; urgency=medium
[ Matthew Hagemann ] [ Matthew Hagemann ]

2
live-build/auto/config
View File

@ -1700,7 +1700,7 @@ EOF
fi fi
if [ "${MAKE_ISO}" = "yes" ]; then if [ "${MAKE_ISO}" = "yes" ]; then
# XXX should pass --iso-status here. # XXX should pass --build-type here.
/usr/share/livecd-rootfs/live-build/gen-iso-ids \ /usr/share/livecd-rootfs/live-build/gen-iso-ids \
--project $PROJECT ${SUBPROJECT:+--subproject $SUBPROJECT} \ --project $PROJECT ${SUBPROJECT:+--subproject $SUBPROJECT} \
--arch $ARCH ${SUBARCH:+--subarch $SUBARCH} ${NOW+--serial $NOW} \ --arch $ARCH ${SUBARCH:+--subarch $SUBARCH} ${NOW+--serial $NOW} \

10
live-build/gen-iso-ids
View File

@ -59,7 +59,7 @@ def make_disk_info(
subarch: str, subarch: str,
capproject: str, capproject: str,
subproject: str, subproject: str,
iso_status: str, build_type: str,
serial: str, serial: str,
) -> str: ) -> str:
# os-release VERSION is _almost_ what goes into .disk/info... # os-release VERSION is _almost_ what goes into .disk/info...
@ -82,7 +82,7 @@ def make_disk_info(
if subarch: if subarch:
fullarch += "+" + subarch fullarch += "+" + subarch
return f"{capproject}{capsubproject} {version} - {iso_status} {fullarch} ({serial})" return f"{capproject}{capsubproject} {version} - {build_type} {fullarch} ({serial})"
def make_vol_id(os_release: dict[str, str], arch: str, capproject: str) -> str: def make_vol_id(os_release: dict[str, str], arch: str, capproject: str) -> str:
@ -146,7 +146,7 @@ def make_vol_id(os_release: dict[str, str], arch: str, capproject: str) -> str:
default=time.strftime("%Y%m%d"), default=time.strftime("%Y%m%d"),
) )
@click.option( @click.option(
"--iso-status", "--build-type",
type=str, type=str,
default="Daily", default="Daily",
) )
@ -162,7 +162,7 @@ def main(
arch: str, arch: str,
subarch: str, subarch: str,
serial: str, serial: str,
iso_status: str, build_type: str,
output_dir: pathlib.Path, output_dir: pathlib.Path,
): ):
output_dir.mkdir(exist_ok=True) output_dir.mkdir(exist_ok=True)
@ -177,7 +177,7 @@ def main(
subarch, subarch,
capproject, capproject,
subproject, subproject,
iso_status, build_type,
serial, serial,
) )
print(f"disk_info: {disk_info!r}") print(f"disk_info: {disk_info!r}")